Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to guacamole 1.5.2 #80

Merged
merged 4 commits into from
Jun 10, 2023
Merged

Update to guacamole 1.5.2 #80

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9be29e4
Update Dockerfile
calebcoverdale May 9, 2023
0b89d94
Merge pull request #79 from calebcoverdale/patch-1
MaxWaldorf May 10, 2023
971a1ff
Update Tomcat version
MaxWaldorf Jun 10, 2023
49f3771
Update Dockerfile to guacamole 1.5.2
MaxWaldorf Jun 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG ALPINE_BASE_IMAGE=latest
FROM alpine:${ALPINE_BASE_IMAGE} AS builder

ARG VERSION="1.5.1"
ARG VERSION="1.5.2"
ARG TARGETPLATFORM

ENV \
Expand Down Expand Up @@ -159,9 +159,9 @@ ARG PREFIX_DIR=/opt/guacamole
ARG APPLICATION="guacamole"
ARG BUILD_RFC3339="2023-04-04T13:00:00Z"
ARG REVISION="local"
ARG DESCRIPTION="Fully Pacaged and Multi-Arch Guacamole container"
ARG DESCRIPTION="Fully Packaged and Multi-Arch Guacamole container"
ARG PACKAGE="flcontainers/guacamole"
ARG VERSION="1.5.1"
ARG VERSION="1.5.2"
ARG POSTGRES_HOST_AUTH_METHOD="trust"

LABEL org.opencontainers.image.ref.name="${PACKAGE}" \
Expand Down Expand Up @@ -222,8 +222,8 @@ RUN apk add --no-cache -X https://dl-cdn.alpinelinux.org/alpine/edge/testing gos

# Install tomcat
RUN mkdir /opt/tomcat
ADD https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.74/bin/apache-tomcat-9.0.74.tar.gz /tmp/
RUN tar xvzf /tmp/apache-tomcat-9.0.74.tar.gz --strip-components 1 --directory /opt/tomcat
ADD https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.76/bin/apache-tomcat-9.0.76.tar.gz /tmp/
RUN tar xvzf /tmp/apache-tomcat-9.0.76.tar.gz --strip-components 1 --directory /opt/tomcat
RUN chmod +x /opt/tomcat/bin/*.sh

RUN groupadd tomcat && \
Expand Down