mirror of
https://github.com/jwetzell/docker-guacamole.git
synced 2026-08-20 14:39:07 +00:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6a3fe53767 | |||
| 369b64cfef | |||
| d4acbf667b | |||
| 65331f1f9b |
+2
-1
@@ -12,7 +12,8 @@ matrix:
|
|||||||
arch: amd64
|
arch: amd64
|
||||||
env:
|
env:
|
||||||
- DOCKERFILE="Dockerfile"
|
- DOCKERFILE="Dockerfile"
|
||||||
- TAG_SUFFIX="amd64"
|
- TAG_SUFFIX="latest"
|
||||||
|
- ALT_SUFFIX="amd64"
|
||||||
|
|
||||||
# arm32v5
|
# arm32v5
|
||||||
- os: linux
|
- os: linux
|
||||||
|
|||||||
+4
-2
@@ -1,7 +1,7 @@
|
|||||||
FROM library/tomcat:9-jre11
|
FROM library/tomcat:9-jre11
|
||||||
|
|
||||||
ENV ARCH=amd64 \
|
ENV ARCH=amd64 \
|
||||||
GUAC_VER=1.1.0 \
|
GUAC_VER=1.3.0 \
|
||||||
GUACAMOLE_HOME=/app/guacamole \
|
GUACAMOLE_HOME=/app/guacamole \
|
||||||
PG_MAJOR=9.6 \
|
PG_MAJOR=9.6 \
|
||||||
PGDATA=/config/postgres \
|
PGDATA=/config/postgres \
|
||||||
@@ -38,7 +38,7 @@ RUN [ "$ARCH" = "amd64" ] && ln -s /usr/local/lib/freerdp /usr/lib/x86_64-linux-
|
|||||||
RUN curl -SLO "http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/${GUAC_VER}/source/guacamole-server-${GUAC_VER}.tar.gz" \
|
RUN curl -SLO "http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/${GUAC_VER}/source/guacamole-server-${GUAC_VER}.tar.gz" \
|
||||||
&& tar -xzf guacamole-server-${GUAC_VER}.tar.gz \
|
&& tar -xzf guacamole-server-${GUAC_VER}.tar.gz \
|
||||||
&& cd guacamole-server-${GUAC_VER} \
|
&& cd guacamole-server-${GUAC_VER} \
|
||||||
&& ./configure \
|
&& ./configure --enable-allow-freerdp-snapshots \
|
||||||
&& make -j$(getconf _NPROCESSORS_ONLN) \
|
&& make -j$(getconf _NPROCESSORS_ONLN) \
|
||||||
&& make install \
|
&& make install \
|
||||||
&& cd .. \
|
&& cd .. \
|
||||||
@@ -74,4 +74,6 @@ WORKDIR /config
|
|||||||
|
|
||||||
COPY root /
|
COPY root /
|
||||||
|
|
||||||
|
EXPOSE 8080
|
||||||
|
|
||||||
ENTRYPOINT [ "/init" ]
|
ENTRYPOINT [ "/init" ]
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
FROM arm32v5/tomcat:9-jre11
|
FROM arm32v5/tomcat:9-jre11
|
||||||
|
|
||||||
ENV ARCH=armhf \
|
ENV ARCH=armhf \
|
||||||
GUAC_VER=1.1.0 \
|
GUAC_VER=1.3.0 \
|
||||||
GUACAMOLE_HOME=/app/guacamole \
|
GUACAMOLE_HOME=/app/guacamole \
|
||||||
PG_MAJOR=9.6 \
|
PG_MAJOR=9.6 \
|
||||||
PGDATA=/config/postgres \
|
PGDATA=/config/postgres \
|
||||||
@@ -38,7 +38,7 @@ RUN [ "$ARCH" = "amd64" ] && ln -s /usr/local/lib/freerdp /usr/lib/x86_64-linux-
|
|||||||
RUN curl -SLO "http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/${GUAC_VER}/source/guacamole-server-${GUAC_VER}.tar.gz" \
|
RUN curl -SLO "http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/${GUAC_VER}/source/guacamole-server-${GUAC_VER}.tar.gz" \
|
||||||
&& tar -xzf guacamole-server-${GUAC_VER}.tar.gz \
|
&& tar -xzf guacamole-server-${GUAC_VER}.tar.gz \
|
||||||
&& cd guacamole-server-${GUAC_VER} \
|
&& cd guacamole-server-${GUAC_VER} \
|
||||||
&& ./configure \
|
&& ./configure --enable-allow-freerdp-snapshots \
|
||||||
&& make -j$(getconf _NPROCESSORS_ONLN) \
|
&& make -j$(getconf _NPROCESSORS_ONLN) \
|
||||||
&& make install \
|
&& make install \
|
||||||
&& cd .. \
|
&& cd .. \
|
||||||
|
|||||||
@@ -19,6 +19,9 @@ else
|
|||||||
if [ "$(cat /config/.database-version)" != "$GUAC_VER" ]; then
|
if [ "$(cat /config/.database-version)" != "$GUAC_VER" ]; then
|
||||||
cat /app/guacamole/schema/upgrade/upgrade-pre-$GUAC_VER.sql | psql -U $POSTGRES_USER -d $POSTGRES_DB -f -
|
cat /app/guacamole/schema/upgrade/upgrade-pre-$GUAC_VER.sql | psql -U $POSTGRES_USER -d $POSTGRES_DB -f -
|
||||||
echo "$GUAC_VER" > /config/.database-version
|
echo "$GUAC_VER" > /config/.database-version
|
||||||
|
|
||||||
|
/etc/cont-init.d/30-defaults.sh
|
||||||
|
/etc/cont-init.d/50-extensions
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user