Skip to content

Commit a5bfc5d

Browse files
MaxWaldorfMaxWaldorf
authored
Merge pull request #96 from flcontainers/dev
update to 1.5.3
2 parents 06941f6 + c42239f commit a5bfc5d

File tree

5 files changed

+56
-20
lines changed

5 files changed

+56
-20
lines changed

‎.github/workflows/docker-image-dev.yml

+28-6
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,39 @@ jobs:
2020
steps:
2121
# Get the repository's code
2222
- name: Checkout
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
with:
2525
ref: dev
26+
2627
# https://github.com/docker/setup-qemu-action
2728
- name: Set up QEMU
28-
uses: docker/setup-qemu-action@v2
29+
uses: docker/setup-qemu-action@v3
30+
2931
# https://github.com/docker/setup-buildx-action
3032
- name: Set up Docker Buildx
3133
id: buildx
32-
uses: docker/setup-buildx-action@v2
34+
uses: docker/setup-buildx-action@v3
35+
36+
- name: Cache Docker layers
37+
uses: actions/cache@v3
38+
with:
39+
path: /tmp/.buildx-cache
40+
# Key is named differently to avoid collision
41+
key: ${{ runner.os }}-multi-buildx-${{ github.sha }}
42+
restore-keys: |
43+
${{ runner.os }}-multi-buildx
44+
3345
# Push to Docker Hub
3446
- name: Login to Docker Hub
3547
if: github.event_name != 'pull_request'
36-
uses: docker/login-action@v2
48+
uses: docker/login-action@v3
3749
with:
3850
username: ${{ secrets.DOCKER_USERNAME }}
3951
password: ${{ secrets.DOCKER_PASSWORD }}
4052

4153
- name: Docker meta
4254
id: guac
43-
uses: docker/metadata-action@v4
55+
uses: docker/metadata-action@v5
4456
with:
4557
# list of Docker images to use as base name for tags
4658
images: |
@@ -53,10 +65,20 @@ jobs:
5365
latest=false
5466
5567
- name: Build and push
56-
uses: docker/build-push-action@v4
68+
uses: docker/build-push-action@v5
5769
with:
5870
context: .
5971
platforms: linux/amd64,linux/arm64/v8,linux/ppc64le
6072
push: ${{ github.event_name != 'pull_request' }}
6173
tags: ${{ steps.guac.outputs.tags }}
6274
labels: ${{ steps.guac.outputs.labels }}
75+
cache-from: type=local,src=/tmp/.buildx-cache
76+
# Note the mode=max here
77+
# More: https://github.com/moby/buildkit#--export-cache-options
78+
# And: https://github.com/docker/buildx#--cache-tonametypetypekeyvalue
79+
cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new
80+
81+
- name: Move cache
82+
run: |
83+
rm -rf /tmp/.buildx-cache
84+
mv /tmp/.buildx-cache-new /tmp/.buildx-cache

‎.github/workflows/docker-image.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,25 @@ jobs:
1717
steps:
1818
# Get the repository's code
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121
# https://github.com/docker/setup-qemu-action
2222
- name: Set up QEMU
23-
uses: docker/setup-qemu-action@v2
23+
uses: docker/setup-qemu-action@v3
2424
# https://github.com/docker/setup-buildx-action
2525
- name: Set up Docker Buildx
2626
id: buildx
27-
uses: docker/setup-buildx-action@v2
27+
uses: docker/setup-buildx-action@v3
2828
# Push to Docker Hub
2929
- name: Login to Docker Hub
3030
if: github.event_name != 'pull_request'
31-
uses: docker/login-action@v2
31+
uses: docker/login-action@v3
3232
with:
3333
username: ${{ secrets.DOCKER_USERNAME }}
3434
password: ${{ secrets.DOCKER_PASSWORD }}
3535

3636
- name: Docker meta
3737
id: guac
38-
uses: docker/metadata-action@v4
38+
uses: docker/metadata-action@v5
3939
with:
4040
# list of Docker images to use as base name for tags
4141
images: |
@@ -48,7 +48,7 @@ jobs:
4848
type=semver,pattern={{major}}
4949
5050
- name: Build and push
51-
uses: docker/build-push-action@v4
51+
uses: docker/build-push-action@v5
5252
with:
5353
context: .
5454
platforms: linux/amd64,linux/arm64/v8,linux/ppc64le

‎Dockerfile

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG ALPINE_BASE_IMAGE=latest
22
FROM alpine:${ALPINE_BASE_IMAGE} AS builder
33

4-
ARG VERSION="1.5.2"
4+
ARG VERSION="1.5.3"
55
ARG TARGETPLATFORM
66

77
ENV \
@@ -161,7 +161,7 @@ ARG BUILD_RFC3339="2023-04-04T13:00:00Z"
161161
ARG REVISION="local"
162162
ARG DESCRIPTION="Fully Packaged and Multi-Arch Guacamole container"
163163
ARG PACKAGE="flcontainers/guacamole"
164-
ARG VERSION="1.5.2"
164+
ARG VERSION="1.5.3"
165165
ARG POSTGRES_HOST_AUTH_METHOD="trust"
166166

167167
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
222222

223223
# Install tomcat
224224
RUN mkdir /opt/tomcat
225-
ADD https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.76/bin/apache-tomcat-9.0.76.tar.gz /tmp/
226-
RUN tar xvzf /tmp/apache-tomcat-9.0.76.tar.gz --strip-components 1 --directory /opt/tomcat
225+
ADD https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.80/bin/apache-tomcat-9.0.80.tar.gz /tmp/
226+
RUN tar xvzf /tmp/apache-tomcat-9.0.80.tar.gz --strip-components 1 --directory /opt/tomcat
227227
RUN chmod +x /opt/tomcat/bin/*.sh
228228

229229
RUN groupadd tomcat && \
@@ -232,7 +232,8 @@ useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat
232232
RUN chgrp -R tomcat /opt/tomcat && \
233233
chmod -R g+r /opt/tomcat/conf && \
234234
chmod g+x /opt/tomcat/conf && \
235-
chown -R tomcat /opt/tomcat/webapps/ /opt/tomcat/work/ /opt/tomcat/temp/ /opt/tomcat/logs/
235+
chown -R tomcat /opt/tomcat/webapps/ /opt/tomcat/work/ /opt/tomcat/temp/ /opt/tomcat/logs/ && \
236+
chmod 777 -R /opt/tomcat/logs/
236237

237238
# Install guacamole-client and postgres auth adapter
238239
RUN set -x \

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ docker run \
5959
- vault-ksm
6060
- history-recording-storage
6161

62-
More information: [Guacamole v1.5.0 release notes](https://guacamole.apache.org/releases/1.5.0/)
62+
More information: [Guacamole v1.5.3 release notes](https://guacamole.apache.org/releases/1.5.3/)
6363

6464
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.
6565

‎filefs/usr/local/bin/_startup.sh

+15-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
11
#!/bin/sh
22
echo "Preparing Config Folder"
33
if [ -d "/config/guacamole/" ]; then
4-
rm -r /config/guacamole/extensions
4+
rm /config/guacamole/extensions/guacamole-auth-duo-*.jar
5+
rm /config/guacamole/extensions/guacamole-auth-header-*.jar
6+
rm /config/guacamole/extensions/guacamole-auth-jdbc-mysql-*.jar
7+
rm /config/guacamole/extensions/guacamole-auth-jdbc-postgresql-*.jar
8+
rm /config/guacamole/extensions/guacamole-auth-jdbc-sqlserver-*.jar
9+
rm /config/guacamole/extensions/guacamole-auth-json-*.jar
10+
rm /config/guacamole/extensions/guacamole-auth-ldap-*.jar
11+
rm /config/guacamole/extensions/guacamole-auth-quickconnect-*.jar
12+
rm /config/guacamole/extensions/guacamole-auth-sso-openid-*.jar
13+
rm /config/guacamole/extensions/guacamole-auth-sso-saml-*.jar
14+
rm /config/guacamole/extensions/guacamole-auth-sso-cas-*.jar
15+
rm /config/guacamole/extensions/guacamole-auth-totp-*.jar
16+
rm /config/guacamole/extensions/guacamole-vault-ksm-*.jar
17+
rm /config/guacamole/extensions/guacamole-history-recording-storage-*.jar
518
rm -r /config/guacamole/extensions-available
619
rm -r /config/guacamole/lib
720
rm -r /config/guacamole/schema
8-
cp -r /app/guacamole/extensions /config/guacamole
21+
cp -r /app/guacamole/extensions/*.jar /config/guacamole/extensions
922
cp -r /app/guacamole/extensions-available /config/guacamole
1023
cp -r /app/guacamole/lib /config/guacamole
1124
cp -r /app/guacamole/schema /config/guacamole

0 commit comments

Comments
 (0)