Skip to content

Commit 6fc72c4

Browse files
committed
fix: add certbot option to docker monolith
1 parent 983776a commit 6fc72c4

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

.github/workflows/docker_build_image.yml

+3
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ jobs:
9090
run: |
9191
MAIN_VERSION=$(python3 -c "from dockerfile_parse import DockerfileParser ; dfparser = DockerfileParser('./docker-${{ matrix.docker-images }}') ; print(dfparser.labels['version'])")
9292
DOCKER_IMAGE=gluufederation/${{ matrix.docker-images }}
93+
if [[ ${{ matrix.docker-images }} == "flex-monolith" ]]; then
94+
DOCKER_IMAGE=gluufederation/monolith
95+
fi
9396
VERSION=${MAIN_VERSION}_dev
9497
BUILD=true
9598
if [[ $GITHUB_REF == refs/tags/docker-${{ matrix.docker-images }}-* ]]; then

docker-flex-monolith/Dockerfile

+4-5
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ RUN echo 'APT::Install-Suggests "0";' >> /etc/apt/apt.conf.d/00-docker \
1717
RUN DEBIAN_FRONTEND=noninteractive \
1818
apt-get update \
1919
&& apt-get install -y python3 tini curl ca-certificates dbus systemd iproute2 gpg python3-pip python3-dev libpq-dev gcc \
20-
&& apt-get clean \
2120
# install certbot
22-
&& apt-get -y install ibaugeas0 \
23-
&& apt-get clean \
21+
&& apt-get -y install libaugeas0 \
2422
&& pip install certbot certbot-apache \
25-
# Cleaning up package lists
23+
# Cleaning up package lists \
24+
&& apt-get clean \
2625
&& rm -rf /var/lib/apt/lists/*
2726

2827

@@ -80,7 +79,7 @@ ENV CN_HOSTNAME="demoexample.gluu.org" \
8079
# misc stuff
8180
# ==========
8281

83-
LABEL name="gluufederation/flex-monolith" \
82+
LABEL name="gluufederation/monolith" \
8483
maintainer="GluuFederation <[email protected]>" \
8584
vendor="GluuFederation" \
8685
version="5.0.0" \

docker-flex-monolith/flex-mysql-compose.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
ports:
88
- "3306:3306"
99
volumes:
10-
- db-data:/var/lib/mysql
10+
- ./db-data:/var/lib/mysql
1111
networks:
1212
- cloud_bridge
1313
environment:
@@ -34,6 +34,7 @@ services:
3434
- CN_CITY=Austin
3535
- CN_STATE=TX
3636
- CN_COUNTRY=US
37+
- IS_FQDN_REGISTERED=false
3738
- CN_INSTALL_CONFIG_API=true
3839
- CN_INSTALL_SCIM=true
3940
- CN_INSTALL_FIDO2=true

0 commit comments

Comments
 (0)