mirror of
https://github.com/jwetzell/docker-guacamole.git
synced 2026-08-16 12:53:34 +00:00
ARG should go INSIDE the FROM
This commit is contained in:
+4
-2
@@ -1,5 +1,5 @@
|
||||
ARG TARGETPLATFORM
|
||||
FROM tomcat:9.0.88-jdk17
|
||||
ARG TARGETPLATFORM
|
||||
|
||||
ENV GUAC_VER=1.5.5 \
|
||||
GUACAMOLE_HOME=/app/guacamole \
|
||||
@@ -17,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=armhf; elif [ "$TARGETPLATFORM" = "linux/arm/v8" ]; then ARCHITECTURE=aarch64; 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
|
||||
|
||||
Reference in New Issue
Block a user