Compare commits

..

2 Commits

Author SHA1 Message Date
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
3 changed files with 7 additions and 2 deletions
+3 -1
View File
@@ -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.2.0 \
GUACAMOLE_HOME=/app/guacamole \ GUACAMOLE_HOME=/app/guacamole \
PG_MAJOR=9.6 \ PG_MAJOR=9.6 \
PGDATA=/config/postgres \ PGDATA=/config/postgres \
@@ -74,4 +74,6 @@ WORKDIR /config
COPY root / COPY root /
EXPOSE 8080
ENTRYPOINT [ "/init" ] ENTRYPOINT [ "/init" ]
+1 -1
View File
@@ -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.2.0 \
GUACAMOLE_HOME=/app/guacamole \ GUACAMOLE_HOME=/app/guacamole \
PG_MAJOR=9.6 \ PG_MAJOR=9.6 \
PGDATA=/config/postgres \ PGDATA=/config/postgres \
+3
View File
@@ -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