From bc8cb3149dea1fb528e9856633bce5a946d984af Mon Sep 17 00:00:00 2001 From: Iain McNulty Date: Fri, 12 Jul 2024 11:32:30 +0100 Subject: [PATCH] Make sure gcompat is in the finished image --- Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 936a8517023..4a7a1908991 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,9 +6,7 @@ FROM ${BASE_RUBY_IMAGE} AS gems-node-modules RUN apk -U upgrade && \ apk add --update --no-cache git gcc libc-dev make postgresql-dev build-base \ - libxml2-dev libxslt-dev nodejs yarn tzdata libpq libxml2 libxslt graphviz chromium - -RUN LINKER_PATH=/lib/ld-musl-x86_64.so.1 LOADER_NAME=ld-linux-x86-64.so.2 apk add --update --no-cache gcompat + libxml2-dev libxslt-dev nodejs yarn tzdata libpq libxml2 libxslt graphviz chromium gcompat RUN echo "Europe/London" > /etc/timezone && \ cp /usr/share/zoneinfo/Europe/London /etc/localtime @@ -60,7 +58,7 @@ ENV LANG=en_GB.UTF-8 \ RUN apk -U upgrade && \ apk add --update --no-cache tzdata libpq libxml2 libxslt graphviz \ - ttf-dejavu ttf-droid ttf-liberation libx11 openssl nodejs chromium && \ + ttf-dejavu ttf-droid ttf-liberation libx11 openssl nodejs chromium gcompat && \ echo "Europe/London" > /etc/timezone && \ cp /usr/share/zoneinfo/Europe/London /etc/localtime