Merge pull request #96 from flcontainers/dev

update to 1.5.3
flcontainers · Sep 21, 2023 · a5bfc5d · a5bfc5d
2 parents 06941f6 + c42239f
commit a5bfc5d
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 20 deletions.
diff --git a/.github/workflows/docker-image-dev.yml b/.github/workflows/docker-image-dev.yml
@@ -20,27 +20,39 @@ jobs:
     steps:
       # Get the repository's code
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: dev
+
       # https://github.com/docker/setup-qemu-action
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
+
       # https://github.com/docker/setup-buildx-action
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
+
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          # Key is named differently to avoid collision
+          key: ${{ runner.os }}-multi-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-multi-buildx
+        
       # Push to Docker Hub
       - name: Login to Docker Hub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Docker meta
         id: guac
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           # list of Docker images to use as base name for tags
           images: |
@@ -53,10 +65,20 @@ jobs:
             latest=false
 
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/amd64,linux/arm64/v8,linux/ppc64le
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.guac.outputs.tags }}
           labels: ${{ steps.guac.outputs.labels }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          # Note the mode=max here
+          # More: https://github.com/moby/buildkit#--export-cache-options
+          # And: https://github.com/docker/buildx#--cache-tonametypetypekeyvalue
+          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new
+
+      - name: Move cache
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -17,25 +17,25 @@ jobs:
     steps:
       # Get the repository's code
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       # https://github.com/docker/setup-qemu-action
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       # https://github.com/docker/setup-buildx-action
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       # Push to Docker Hub
       - name: Login to Docker Hub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Docker meta
         id: guac
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           # list of Docker images to use as base name for tags
           images: |
@@ -48,7 +48,7 @@ jobs:
             type=semver,pattern={{major}}
 
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/amd64,linux/arm64/v8,linux/ppc64le

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 ARG ALPINE_BASE_IMAGE=latest
 FROM alpine:${ALPINE_BASE_IMAGE} AS builder
 
-ARG VERSION="1.5.2"
+ARG VERSION="1.5.3"
 ARG TARGETPLATFORM
 
 ENV \
@@ -161,7 +161,7 @@ ARG BUILD_RFC3339="2023-04-04T13:00:00Z"
 ARG REVISION="local"
 ARG DESCRIPTION="Fully Packaged and Multi-Arch Guacamole container"
 ARG PACKAGE="flcontainers/guacamole"
-ARG VERSION="1.5.2"
+ARG VERSION="1.5.3"
 ARG POSTGRES_HOST_AUTH_METHOD="trust"
 
 LABEL org.opencontainers.image.ref.name="${PACKAGE}" \
@@ -222,8 +222,8 @@ RUN apk add --no-cache -X https://dl-cdn.alpinelinux.org/alpine/edge/testing gos
 
 # Install tomcat
 RUN mkdir /opt/tomcat
-ADD https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.76/bin/apache-tomcat-9.0.76.tar.gz /tmp/
-RUN tar xvzf /tmp/apache-tomcat-9.0.76.tar.gz --strip-components 1 --directory /opt/tomcat
+ADD https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.80/bin/apache-tomcat-9.0.80.tar.gz /tmp/
+RUN tar xvzf /tmp/apache-tomcat-9.0.80.tar.gz --strip-components 1 --directory /opt/tomcat
 RUN chmod +x /opt/tomcat/bin/*.sh
 
 RUN groupadd tomcat && \
@@ -232,7 +232,8 @@ useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat
 RUN chgrp -R tomcat /opt/tomcat && \
 chmod -R g+r /opt/tomcat/conf && \
 chmod g+x /opt/tomcat/conf && \
-chown -R tomcat /opt/tomcat/webapps/ /opt/tomcat/work/ /opt/tomcat/temp/ /opt/tomcat/logs/
+chown -R tomcat /opt/tomcat/webapps/ /opt/tomcat/work/ /opt/tomcat/temp/ /opt/tomcat/logs/ && \
+chmod 777 -R /opt/tomcat/logs/
 
 # Install guacamole-client and postgres auth adapter
 RUN set -x \

diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ docker run \
 - vault-ksm
 - history-recording-storage
 
-More information: [Guacamole v1.5.0 release notes](https://guacamole.apache.org/releases/1.5.0/)
+More information: [Guacamole v1.5.3 release notes](https://guacamole.apache.org/releases/1.5.3/)
 
 You should only enable the extensions you require, if an extensions is not configured correctly in the `guacamole.properties` file it may prevent the system from loading. See the [official documentation](https://guacamole.apache.org/doc/gug/) for more details.
 

diff --git a/filefs/usr/local/bin/_startup.sh b/filefs/usr/local/bin/_startup.sh
@@ -1,11 +1,24 @@
 #!/bin/sh
 echo "Preparing Config Folder"
 if [ -d "/config/guacamole/" ]; then
-  rm -r /config/guacamole/extensions
+  rm /config/guacamole/extensions/guacamole-auth-duo-*.jar
+  rm /config/guacamole/extensions/guacamole-auth-header-*.jar
+  rm /config/guacamole/extensions/guacamole-auth-jdbc-mysql-*.jar
+  rm /config/guacamole/extensions/guacamole-auth-jdbc-postgresql-*.jar
+  rm /config/guacamole/extensions/guacamole-auth-jdbc-sqlserver-*.jar
+  rm /config/guacamole/extensions/guacamole-auth-json-*.jar
+  rm /config/guacamole/extensions/guacamole-auth-ldap-*.jar
+  rm /config/guacamole/extensions/guacamole-auth-quickconnect-*.jar
+  rm /config/guacamole/extensions/guacamole-auth-sso-openid-*.jar
+  rm /config/guacamole/extensions/guacamole-auth-sso-saml-*.jar
+  rm /config/guacamole/extensions/guacamole-auth-sso-cas-*.jar
+  rm /config/guacamole/extensions/guacamole-auth-totp-*.jar
+  rm /config/guacamole/extensions/guacamole-vault-ksm-*.jar
+  rm /config/guacamole/extensions/guacamole-history-recording-storage-*.jar
   rm -r /config/guacamole/extensions-available
   rm -r /config/guacamole/lib
   rm -r /config/guacamole/schema
-  cp -r /app/guacamole/extensions /config/guacamole
+  cp -r /app/guacamole/extensions/*.jar /config/guacamole/extensions
   cp -r /app/guacamole/extensions-available /config/guacamole
   cp -r /app/guacamole/lib /config/guacamole
   cp -r /app/guacamole/schema /config/guacamole