fix: add certbot option to docker monolith

GluuFederation · Oct 13, 2022 · 6fc72c4 · 6fc72c4
1 parent 983776a
commit 6fc72c4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/docker_build_image.yml b/.github/workflows/docker_build_image.yml
@@ -90,6 +90,9 @@ jobs:
         run: |
           MAIN_VERSION=$(python3 -c "from dockerfile_parse import DockerfileParser ; dfparser = DockerfileParser('./docker-${{ matrix.docker-images }}') ; print(dfparser.labels['version'])")
           DOCKER_IMAGE=gluufederation/${{ matrix.docker-images }}
+          if [[ ${{ matrix.docker-images }} == "flex-monolith" ]]; then
+            DOCKER_IMAGE=gluufederation/monolith
+          fi
           VERSION=${MAIN_VERSION}_dev
           BUILD=true
           if [[ $GITHUB_REF == refs/tags/docker-${{ matrix.docker-images }}-* ]]; then

diff --git a/docker-flex-monolith/Dockerfile b/docker-flex-monolith/Dockerfile
@@ -17,12 +17,11 @@ RUN echo 'APT::Install-Suggests "0";' >> /etc/apt/apt.conf.d/00-docker \
 RUN DEBIAN_FRONTEND=noninteractive \
     apt-get update \
     && apt-get install -y python3 tini curl ca-certificates dbus systemd iproute2 gpg python3-pip python3-dev libpq-dev gcc \
-    && apt-get clean \
     # install certbot
-    && apt-get -y install ibaugeas0 \
-    && apt-get clean \
+    && apt-get -y install libaugeas0 \
     && pip install certbot certbot-apache \
-    # Cleaning up package lists
+    # Cleaning up package lists \
+    && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
 
@@ -80,7 +79,7 @@ ENV CN_HOSTNAME="demoexample.gluu.org" \
 # misc stuff
 # ==========
 
-LABEL name="gluufederation/flex-monolith" \
+LABEL name="gluufederation/monolith" \
     maintainer="GluuFederation <support@gluu.org>" \
     vendor="GluuFederation" \
     version="5.0.0" \

diff --git a/docker-flex-monolith/flex-mysql-compose.yml b/docker-flex-monolith/flex-mysql-compose.yml
@@ -7,7 +7,7 @@ services:
     ports:
       - "3306:3306"
     volumes:
-      - db-data:/var/lib/mysql
+      - ./db-data:/var/lib/mysql
     networks:
       - cloud_bridge
     environment:
@@ -34,6 +34,7 @@ services:
       - CN_CITY=Austin
       - CN_STATE=TX
       - CN_COUNTRY=US
+      - IS_FQDN_REGISTERED=false
       - CN_INSTALL_CONFIG_API=true
       - CN_INSTALL_SCIM=true
       - CN_INSTALL_FIDO2=true