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

GUACAMOLE-1685: Optimize Dockerfile layering by minimizing run statem… #763

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

GUACAMOLE-1685: Optimize Dockerfile layering by minimizing run statem… #763

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00c9d5a
GUACAMOLE-1685: Optimize Dockerfile layering by minimizing run statem…
pbuehl-redhat Sep 26, 2022
c2a85ae
GUACAMOLE-1685: Add extra fix
pbuehl-redhat Sep 26, 2022
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
26 changes: 12 additions & 14 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@
ARG TOMCAT_VERSION=8.5
ARG TOMCAT_JRE=jdk8

# Use args to build radius auth extension such as
# `--build-arg BUILD_PROFILE=lgpl-extensions`
ARG BUILD_PROFILE

# Use official maven image for the build
FROM maven:3-jdk-8 AS builder

# Install chromium-driver for sake of JavaScript unit tests
RUN apt-get update && apt-get install -y chromium-driver

# Use args to build radius auth extension such as
# `--build-arg BUILD_PROFILE=lgpl-extensions`
ARG BUILD_PROFILE

# Build environment variables
ENV \
BUILD_DIR=/tmp/guacamole-docker-BUILD
Expand All @@ -53,23 +53,21 @@ RUN /opt/guacamole/bin/build-guacamole.sh "$BUILD_DIR" /opt/guacamole "$BUILD_PR
# For the runtime image, we start with the official Tomcat distribution
FROM tomcat:${TOMCAT_VERSION}-${TOMCAT_JRE}

# Install XMLStarlet for server.xml alterations
RUN apt-get update -qq \
&& apt-get install -y xmlstarlet \
&& rm -rf /var/lib/apt/lists/*
# Install XMLStarlet for server.xml alterations and create a new user guacamole
ARG UID=1001
ARG GID=1001
RUN apt-get update -qq && \
apt-get install -y xmlstarlet && \
rm -rf /var/lib/apt/lists/*; \
groupadd --gid $GID guacamole && \
useradd --system --create-home --shell /usr/sbin/nologin --uid $UID --gid $GID guacamole

# This is where the build artifacts go in the runtime image
WORKDIR /opt/guacamole

# Copy artifacts from builder image into this image
COPY --from=builder /opt/guacamole/ .

# Create a new user guacamole
ARG UID=1001
ARG GID=1001
RUN groupadd --gid $GID guacamole
RUN useradd --system --create-home --shell /usr/sbin/nologin --uid $UID --gid $GID guacamole

# Run with user guacamole
USER guacamole

Expand Down