From 91ac84e72f5aecfd1e2c0aec3ff0c07a9a75b45c Mon Sep 17 00:00:00 2001 From: maride Date: Thu, 16 Mar 2023 13:21:19 +0100 Subject: [PATCH] Migrate Dockerfile from Alpine to Ubuntu --- Dockerfile | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index a556b433..96195d8c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,26 +23,26 @@ # The Alpine Linux image that should be used as the basis for the guacd image ARG ALPINE_BASE_IMAGE=latest -FROM alpine:${ALPINE_BASE_IMAGE} AS builder +FROM ubuntu AS builder # Install build dependencies -RUN apk add --no-cache \ +RUN apt update && apt install -y \ autoconf \ automake \ - build-base \ - cairo-dev \ + gcc g++ \ + libcairo2-dev \ cmake \ git \ grep \ - libjpeg-turbo-dev \ + libjpeg-turbo8-dev \ libpng-dev \ libtool \ libwebp-dev \ make \ - openssl-dev \ - pango-dev \ - pulseaudio-dev \ - util-linux-dev + libssl-dev \ + libpango1.0-dev \ + libpulse-dev \ + libspice-client-glib-2.0-dev # Copy source to container for sake of build ARG BUILD_DIR=/tmp/guacamole-server @@ -146,7 +146,7 @@ RUN ${BUILD_DIR}/src/guacd-docker/bin/list-dependencies.sh \ > ${PREFIX_DIR}/DEPENDENCIES # Use same Alpine version as the base for the runtime image -FROM alpine:${ALPINE_BASE_IMAGE} +FROM ubuntu # # Base directory for installed build artifacts. See also the @@ -166,16 +166,15 @@ ENV GUACD_LOG_LEVEL=info COPY --from=builder ${PREFIX_DIR} ${PREFIX_DIR} # Bring runtime environment up to date and install runtime dependencies -RUN apk add --no-cache \ +RUN apt update && apt install -y \ ca-certificates \ ghostscript \ netcat-openbsd \ - shadow \ - terminus-font \ - ttf-dejavu \ - ttf-liberation \ - util-linux-login && \ - xargs apk add --no-cache < ${PREFIX_DIR}/DEPENDENCIES + fonts-terminus \ + fonts-dejavu \ + fonts-liberation \ + libcairo2 \ + libspice-client-glib-2.0-8 # Checks the operating status every 5 minutes with a timeout of 5 seconds HEALTHCHECK --interval=5m --timeout=5s CMD nc -z 127.0.0.1 4822 || exit 1