Compare commits

..

11 Commits

Author SHA1 Message Date
jwetzell 7945b12de0 ARG should go INSIDE the FROM 2024-07-06 10:17:50 -05:00
jwetzell ccd2ec594c Create dependabot.yml 2024-07-06 08:17:21 -05:00
jwetzell 28b82a68a8 add TARGETPLATFORM arg 2024-07-06 08:06:04 -05:00
jwetzell 87fd435aac update image version used in README 2024-05-27 10:44:27 -05:00
jwetzell d7178feb80 v8 platform is not necessary 2024-05-17 14:41:45 -05:00
jwetzell 54982f26f3 add back arm/v7 platform 2024-05-17 14:40:20 -05:00
jwetzell 3cf4b6c741 update platforms in build base 2024-05-17 14:38:15 -05:00
jwetzell e27dedf9a8 update platforms in build latest 2024-05-17 14:37:53 -05:00
jwetzell 248049dc38 fix arm version on s6 overlay 2024-05-07 20:22:39 -05:00
jwetzell 6b8de99ece switch to jdk 17 2024-05-05 22:43:45 -05:00
jwetzell 7adcd7f3dc update base to tomcat 9.0.88 and java jdk 21 2024-05-05 22:41:01 -05:00
3 changed files with 15 additions and 6 deletions
+6
View File
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: 'weekly'
+5 -2
View File
@@ -1,4 +1,5 @@
FROM tomcat:9.0.85-jre11
FROM tomcat:9.0.88-jdk17
ARG TARGETPLATFORM
ENV GUAC_VER=1.5.5 \
GUACAMOLE_HOME=/app/guacamole \
@@ -16,8 +17,10 @@ RUN useradd postgres
# Cleanup default tomcat stuff
RUN rm -rf /usr/local/tomcat/webapps.dist
RUN echo $TARGETPLATFORM
# Apply the s6-overlay
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=amd64; elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then ARCHITECTURE=arm; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCHITECTURE=aarch64; else ARCHITECTURE=amd64; fi \
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=amd64; elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then ARCHITECTURE=armhf; elif [ "$TARGETPLATFORM" = "linux/arm/v8" ]; then ARCHITECTURE=aarch64; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCHITECTURE=aarch64; fi \
&& curl -sS -L -O --output-dir /tmp/ --create-dirs "https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-${ARCHITECTURE}-installer" \
&& chmod +x /tmp/s6-overlay-${ARCHITECTURE}-installer && /tmp/s6-overlay-${ARCHITECTURE}-installer / \
&& rm -rf /tmp/s6-overlay-${ARCHITECTURE}-installer
+4 -4
View File
@@ -18,7 +18,7 @@ This container runs the guacamole web client, the guacd server and a postgres da
docker run \
-p 8080:8080 \
-v </path/to/config>:/config \
jwetzell/guacamole
jwetzell/guacamole:1.5.5
```
## Raspberry Pi / ARMv7
@@ -29,7 +29,7 @@ Now that the image has been converted to a multi-platform image the command for
docker run \
-p 8080:8080 \
-v </path/to/config>:/config \
jwetzell/guacamole
jwetzell/guacamole:1.5.5
```
## Parameters
@@ -51,7 +51,7 @@ docker run \
-p 8080:8080 \
-v </path/to/config>:/config \
-e "EXTENSIONS=auth-ldap,auth-duo"
jwetzell/guacamole
jwetzell/guacamole:1.5.5
```
Currently the available extensions are:
@@ -85,7 +85,7 @@ Mapped volumes behave differently when running Docker for Windows and you may en
version: "2"
services:
guacamole:
image: jwetzell/guacamole
image: jwetzell/guacamole:1.5.5
container_name: guacamole
volumes:
- postgres:/config