From 00ee064055a048200c91e2cbe741f77f30d7854f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=BCller?= Date: Thu, 28 Sep 2023 15:00:58 +0200 Subject: [PATCH] Try bookworm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcel Müller --- shallow-server/Dockerfile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/shallow-server/Dockerfile b/shallow-server/Dockerfile index f8fc69ed..136506fc 100644 --- a/shallow-server/Dockerfile +++ b/shallow-server/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye +FROM debian:bookworm # Update repos install packages and cleanup # all in one step so we avoid large intermediate layers. @@ -17,15 +17,13 @@ RUN apt-get update && \ apt-get autoremove -y && apt-get autoclean && apt-get clean && \ rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* -# Use git version from bullseye-backports to work around an issue on self-hosted runner -RUN echo "deb http://deb.debian.org/debian bullseye-backports main contrib non-free" >> /etc/apt/sources.list && \ - apt-get update && apt-get -t bullseye-backports install git -y - COPY opcache-recommended.ini /usr/local/etc/php/conf.d/ WORKDIR /var/www/html -RUN rm -rf /var/www/html +# Looks like there's an issue on self-hosted runners with fuse-overlayfs that prevents us deleting the directory directly +# so rename it first and then remove it +RUN mv /var/www/html/ /var/www/html2/ && rm -rf /var/www/html2/ RUN mkdir -p /var/www/html RUN git clone --depth 1 https://github.com/nextcloud/server.git .