Skip to content

Commit

Permalink
fix workdir on 1.5.4
Browse files Browse the repository at this point in the history
  • Loading branch information
marcolussetti committed Apr 18, 2024
1 parent fbc5325 commit 2394e39
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Inherit from the main guacamole official image
FROM guacamole/guacamole:1.5.5
FROM guacamole/guacamole:1.5.4

# Make directories to support adding in jars
USER root
Expand All @@ -9,21 +9,22 @@ RUN mkdir -p /tmp
WORKDIR /tmp

# Download jar that supports saml (Azure Entra ID)
RUN curl -O https://archive.apache.org/dist/guacamole/1.5.5/binary/guacamole-auth-sso-1.5.5.tar.gz
RUN tar -xvzf /tmp/guacamole-auth-sso-1.5.5.tar.gz
RUN cp /tmp/guacamole-auth-sso-1.5.5/saml/guacamole-auth-sso-saml-1.5.5.jar /opt/guacamole/extensions/
RUN curl -O https://archive.apache.org/dist/guacamole/1.5.4/binary/guacamole-auth-sso-1.5.4.tar.gz
RUN tar -xvzf /tmp/guacamole-auth-sso-1.5.4.tar.gz
RUN cp /tmp/guacamole-auth-sso-1.5.4/saml/guacamole-auth-sso-saml-1.5.4.jar /opt/guacamole/extensions/

# Download jar that supports DB (postgres) authentication
RUN curl -O https://archive.apache.org/dist/guacamole/1.5.5/binary/guacamole-auth-jdbc-1.5.5.tar.gz
RUN tar -xvzf /tmp/guacamole-auth-jdbc-1.5.5.tar.gz
RUN cp /tmp/guacamole-auth-jdbc-1.5.5/postgresql/guacamole-auth-jdbc-postgresql-1.5.5.jar /opt/guacamole/extensions/
RUN curl -O https://archive.apache.org/dist/guacamole/1.5.4/binary/guacamole-auth-jdbc-1.5.4.tar.gz
RUN tar -xvzf /tmp/guacamole-auth-jdbc-1.5.4.tar.gz
RUN cp /tmp/guacamole-auth-jdbc-1.5.4/postgresql/guacamole-auth-jdbc-postgresql-1.5.4.jar /opt/guacamole/extensions/

# Download jar that supports DB (postgres)
RUN curl -O https://jdbc.postgresql.org/download/postgresql-42.6.2.jar
RUN cp /tmp/postgresql-42.6.2.jar /opt/guacamole/lib/
RUN rm -rf /tmp/*

# Now last 3 lines from the official image that actually start the guacamole service
WORKDIR /opt/guacamole
USER guacamole
EXPOSE 8080
CMD ["/opt/guacamole/bin/start.sh"]

0 comments on commit 2394e39

Please sign in to comment.