jwetzell/docker-guacamole
1
0
Fork 0
mirror of https://github.com/jwetzell/docker-guacamole.git synced 2026-08-22 07:29:09 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

make libssh2 version an env variable

Browse Source
This commit is contained in:
Joel Wetzell
2023-12-19 14:15:47 -06:00
parent 255d5c6d0a
commit 99294c461e
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile.amd64
+5 -5
View File
@@ -4,6 +4,7 @@ ENV ARCH=amd64 \
GUAC_VER=1.5.4 \ GUAC_VER=1.5.4 \
GUACAMOLE_HOME=/app/guacamole \ GUACAMOLE_HOME=/app/guacamole \
PG_MAJOR=9.6 \ PG_MAJOR=9.6 \
LIBSSH2_VER=1.11.0 \
PGDATA=/config/postgres \ PGDATA=/config/postgres \
POSTGRES_USER=guacamole \ POSTGRES_USER=guacamole \
POSTGRES_DB=guacamole_db POSTGRES_DB=guacamole_db
@@ -25,14 +26,13 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Build & install libssh2 # Build & install libssh2
ADD https://www.libssh2.org/download/libssh2-1.11.0.tar.gz /tmp ADD https://www.libssh2.org/download/libssh2-${LIBSSH2_VER}.tar.gz /tmp
RUN tar -xzvf /tmp/libssh2-1.11.0.tar.gz \ RUN tar -xzvf /tmp/libssh2-${LIBSSH2_VER}.tar.gz \
&& cd libssh2-1.11.0 \ && cd libssh2-${LIBSSH2_VER} \
&& ./configure \ && ./configure \
&& make \ && make \
&& make install \ && make install \
&& cd .. \ && rm -rf /tmp/libssh2-${LIBSSH2_VER}*
&& rm -rf libssh2-1.11.0.tar.gz libssh2-1.11.0
# 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.tar.gz /tmp
Dockerfile.arm64
+5 -5
View File
@@ -3,6 +3,7 @@ FROM library/tomcat:9-jre11-openjdk-bullseye
ENV GUAC_VER=1.5.4 \ ENV GUAC_VER=1.5.4 \
GUACAMOLE_HOME=/app/guacamole \ GUACAMOLE_HOME=/app/guacamole \
PG_MAJOR=9.6 \ PG_MAJOR=9.6 \
LIBSSH2_VER=1.11.0 \
PGDATA=/config/postgres \ PGDATA=/config/postgres \
POSTGRES_USER=guacamole \ POSTGRES_USER=guacamole \
POSTGRES_DB=guacamole_db POSTGRES_DB=guacamole_db
@@ -24,14 +25,13 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Build & install libssh2 # Build & install libssh2
ADD https://www.libssh2.org/download/libssh2-1.11.0.tar.gz /tmp ADD https://www.libssh2.org/download/libssh2-${LIBSSH2_VER}.tar.gz /tmp
RUN tar -xzvf /tmp/libssh2-1.11.0.tar.gz \ RUN tar -xzvf /tmp/libssh2-${LIBSSH2_VER}.tar.gz \
&& cd libssh2-1.11.0 \ && cd libssh2-${LIBSSH2_VER} \
&& ./configure \ && ./configure \
&& make \ && make \
&& make install \ && make install \
&& cd .. \ && rm -rf /tmp/libssh2-${LIBSSH2_VER}*
&& rm -rf libssh2-1.11.0.tar.gz libssh2-1.11.0
# 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.tar.gz /tmp