jwetzell/docker-guacamole
1
0
Fork 0
mirror of https://github.com/jwetzell/docker-guacamole.git synced 2026-09-02 04:49:06 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

update to latest tomcat 9 and ubuntu based images

Browse Source
This commit is contained in:
Joel Wetzell
2024-02-07 15:58:11 -06:00
parent 661f957c5b
commit bc9058686a
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile.amd64
+8 -6
View File
@@ -1,4 +1,4 @@
FROM library/tomcat:9-jre11-openjdk-bullseye FROM tomcat:9.0.85-jre11
ENV ARCH=amd64 \ ENV ARCH=amd64 \
GUAC_VER=1.5.4 \ GUAC_VER=1.5.4 \
@@ -8,11 +8,13 @@ ENV ARCH=amd64 \
PGDATA=/config/postgres \ PGDATA=/config/postgres \
POSTGRES_USER=guacamole \ POSTGRES_USER=guacamole \
POSTGRES_DB=guacamole_db POSTGRES_DB=guacamole_db
RUN rm -rf /usr/local/tomcat/webapps.dist
# Install dependencies # Install dependencies
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y curl ca-certificates gnupg \ && apt-get install -y curl ca-certificates gnupg \
libcairo2-dev libjpeg62-turbo-dev libpng-dev libavformat-dev \ libcairo2-dev libjpeg-turbo8-dev libpng-dev libavformat-dev \
libossp-uuid-dev libavcodec-dev libavutil-dev \ libossp-uuid-dev libavcodec-dev libavutil-dev \
libswscale-dev freerdp2-dev libfreerdp-client2-2 libpango1.0-dev \ libswscale-dev freerdp2-dev libfreerdp-client2-2 libpango1.0-dev \
libtelnet-dev libvncserver-dev \ libtelnet-dev libvncserver-dev \
@@ -41,10 +43,10 @@ RUN tar -xzvf /tmp/postgresql-${PG_VER}.tar.gz \
RUN useradd postgres RUN useradd postgres
# Apply the s6-overlay # Apply the s6-overlay
ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-amd64.tar.gz /tmp ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-amd64-installer /tmp/
RUN tar -xzf /tmp/s6-overlay-amd64.tar.gz -C / \ RUN chmod +x /tmp/s6-overlay-amd64-installer && /tmp/s6-overlay-amd64-installer / \
&& tar -xzf /tmp/s6-overlay-amd64.tar.gz -C /usr ./bin \ && rm -rf /tmp/s6-overlay-amd64-installer
&& rm -rf /tmp/s6-overlay-amd64.tar.gz
RUN mkdir -p ${GUACAMOLE_HOME} \ RUN mkdir -p ${GUACAMOLE_HOME} \
${GUACAMOLE_HOME}/lib \ ${GUACAMOLE_HOME}/lib \
Dockerfile.arm64
+7 -6
View File
@@ -1,4 +1,4 @@
FROM library/tomcat:9-jre11-openjdk-bullseye FROM tomcat:9.0.85-jre11
ENV GUAC_VER=1.5.4 \ ENV GUAC_VER=1.5.4 \
GUACAMOLE_HOME=/app/guacamole \ GUACAMOLE_HOME=/app/guacamole \
@@ -8,10 +8,12 @@ ENV GUAC_VER=1.5.4 \
POSTGRES_USER=guacamole \ POSTGRES_USER=guacamole \
POSTGRES_DB=guacamole_db POSTGRES_DB=guacamole_db
RUN rm -rf /usr/local/tomcat/webapps.dist
# Install dependencies # Install dependencies
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y curl ca-certificates gnupg \ && apt-get install -y curl ca-certificates gnupg \
libcairo2-dev libjpeg62-turbo-dev libpng-dev libavformat-dev \ libcairo2-dev libjpeg-turbo8-dev libpng-dev libavformat-dev \
libossp-uuid-dev libavcodec-dev libavutil-dev \ libossp-uuid-dev libavcodec-dev libavutil-dev \
libswscale-dev freerdp2-dev libfreerdp-client2-2 libpango1.0-dev \ libswscale-dev freerdp2-dev libfreerdp-client2-2 libpango1.0-dev \
libtelnet-dev libvncserver-dev \ libtelnet-dev libvncserver-dev \
@@ -39,10 +41,9 @@ RUN tar -xzvf /tmp/postgresql-${PG_VER}.tar.gz \
RUN useradd postgres RUN useradd postgres
# Apply the s6-overlay # Apply the s6-overlay
ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-armhf.tar.gz /tmp ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-armhf-installer /tmp/
RUN tar -xzf /tmp/s6-overlay-armhf.tar.gz -C / \ RUN chmod +x /tmp/s6-overlay-armhf-installer && /tmp/s6-overlay-armhf-installer / \
&& tar -xzf /tmp/s6-overlay-armhf.tar.gz -C /usr ./bin \ && rm -rf /tmp/s6-overlay-armhf-installer
&& rm -rf /tmp/s6-overlay-armhf.tar.gz
RUN mkdir -p ${GUACAMOLE_HOME} \ RUN mkdir -p ${GUACAMOLE_HOME} \
${GUACAMOLE_HOME}/lib \ ${GUACAMOLE_HOME}/lib \
Dockerfile.raspberry-pi
+6 -5
View File
@@ -1,4 +1,4 @@
FROM arm32v7/tomcat:9-jre11 FROM arm32v7/tomcat:9.0.85-jre11
ENV GUAC_VER=1.5.4 \ ENV GUAC_VER=1.5.4 \
GUACAMOLE_HOME=/app/guacamole \ GUACAMOLE_HOME=/app/guacamole \
@@ -8,6 +8,8 @@ ENV GUAC_VER=1.5.4 \
POSTGRES_USER=guacamole \ POSTGRES_USER=guacamole \
POSTGRES_DB=guacamole_db POSTGRES_DB=guacamole_db
RUN rm -rf /usr/local/tomcat/webapps.dist
# Install base dependencies # Install base dependencies
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y curl ca-certificates gnupg \ && apt-get install -y curl ca-certificates gnupg \
@@ -39,10 +41,9 @@ RUN tar -xzvf /tmp/postgresql-${PG_VER}.tar.gz \
RUN useradd postgres RUN useradd postgres
# Apply the s6-overlay # Apply the s6-overlay
ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-armhf.tar.gz /tmp ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-armhf-installer /tmp/
RUN tar -xzf /tmp/s6-overlay-armhf.tar.gz -C / \ RUN chmod +x /tmp/s6-overlay-armhf-installer && /tmp/s6-overlay-armhf-installer / \
&& tar -xzf /tmp/s6-overlay-armhf.tar.gz -C /usr ./bin \ && rm -rf /tmp/s6-overlay-armhf-installer
&& rm -rf /tmp/s6-overlay-armhf.tar.gz
RUN mkdir -p ${GUACAMOLE_HOME} \ RUN mkdir -p ${GUACAMOLE_HOME} \
${GUACAMOLE_HOME}/lib \ ${GUACAMOLE_HOME}/lib \