Compare commits

...

4 Commits

Author SHA1 Message Date
oznu 6a3fe53767 Guacamole 1.3 2021-02-06 21:16:00 +11:00
oznu 369b64cfef fix latest tag 2020-08-07 22:48:31 +10:00
oznu d4acbf667b ensure login works after db update 2020-07-03 21:52:11 +10:00
oznu 65331f1f9b guac 1.2.0 2020-07-03 21:45:06 +10:00
4 changed files with 11 additions and 5 deletions
+2 -1
View File
@@ -12,7 +12,8 @@ matrix:
arch: amd64
env:
- DOCKERFILE="Dockerfile"
- TAG_SUFFIX="amd64"
- TAG_SUFFIX="latest"
- ALT_SUFFIX="amd64"
# arm32v5
- os: linux
+4 -2
View File
@@ -1,7 +1,7 @@
FROM library/tomcat:9-jre11
ENV ARCH=amd64 \
GUAC_VER=1.1.0 \
GUAC_VER=1.3.0 \
GUACAMOLE_HOME=/app/guacamole \
PG_MAJOR=9.6 \
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" \
&& tar -xzf guacamole-server-${GUAC_VER}.tar.gz \
&& cd guacamole-server-${GUAC_VER} \
&& ./configure \
&& ./configure --enable-allow-freerdp-snapshots \
&& make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \
&& cd .. \
@@ -74,4 +74,6 @@ WORKDIR /config
COPY root /
EXPOSE 8080
ENTRYPOINT [ "/init" ]
+2 -2
View File
@@ -1,7 +1,7 @@
FROM arm32v5/tomcat:9-jre11
ENV ARCH=armhf \
GUAC_VER=1.1.0 \
GUAC_VER=1.3.0 \
GUACAMOLE_HOME=/app/guacamole \
PG_MAJOR=9.6 \
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" \
&& tar -xzf guacamole-server-${GUAC_VER}.tar.gz \
&& cd guacamole-server-${GUAC_VER} \
&& ./configure \
&& ./configure --enable-allow-freerdp-snapshots \
&& make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \
&& cd .. \
+3
View File
@@ -19,6 +19,9 @@ else
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 -
echo "$GUAC_VER" > /config/.database-version
/etc/cont-init.d/30-defaults.sh
/etc/cont-init.d/50-extensions
fi
fi