upgrade to debian bullseye, remove docker from image, purge build dependecies within the build layer

Author: luka5

docker/Dockerfile

@@ -1,11 +1,6 @@
-ARG FROM=debian:buster-slim
+ARG FROM=debian:bullseye-slim
 FROM ${FROM}
 
-ARG DEBIAN_FRONTEND=noninteractive
-ARG GIT_VERSION="2.26.2"
-ARG GH_RUNNER_VERSION
-ARG DOCKER_COMPOSE_VERSION="1.27.4"
-
 ENV RUNNER_NAME=""
 ENV RUNNER_WORK_DIRECTORY="_work"
 ENV RUNNER_TOKEN=""
@@ -27,63 +22,39 @@ LABEL maintainer="me@tcardonne.fr" \
     org.label-schema.vendor="Thomas Cardonne" \
     org.label-schema.docker.cmd="docker run -it tcardonne/github-runner:latest"
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
-    apt-get install -y \
+RUN apt-get update && \
+    apt-get install --assume-yes \
         curl \
-        unzip \
-        apt-transport-https \
-        ca-certificates \
-        software-properties-common \
-        sudo \
+        git \
         supervisor \
-        jq \
-        iputils-ping \
-        build-essential \
-        zlib1g-dev \
-        gettext \
-        liblttng-ust0 \
-        libcurl4-openssl-dev \
-        openssh-client && \
-    rm -rf /var/lib/apt/lists/* && \
-    apt-get clean
-
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-RUN chmod 644 /etc/supervisor/conf.d/supervisord.conf
-
-# Install Docker CLI
-RUN curl -fsSL https://get.docker.com -o- | sh && \
-    rm -rf /var/lib/apt/lists/* && \
+        jq && \
+    rm --recursive --force /var/lib/apt/lists/* && \
     apt-get clean
 
-# Install Docker-Compose
-RUN curl -L -o /usr/local/bin/docker-compose \
-    "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m)" && \
-    chmod +x /usr/local/bin/docker-compose
-
-RUN cd /tmp && \
-    curl -sL -o git.tgz \
-    https://www.kernel.org/pub/software/scm/git/git-${GIT_VERSION}.tar.gz && \
-    tar zxf git.tgz  && \
-    cd git-${GIT_VERSION}  && \
-    ./configure --prefix=/usr  && \
-    make && \
-    make install && \
-    rm -rf /tmp/*
-
-RUN mkdir -p /home/runner ${AGENT_TOOLSDIRECTORY}
+RUN mkdir --parents /home/runner ${AGENT_TOOLSDIRECTORY}
 
 WORKDIR /home/runner
 
-RUN GH_RUNNER_VERSION=${GH_RUNNER_VERSION:-$(curl --silent "https://api.github.com/repos/actions/runner/releases/latest" | grep tag_name | sed -E 's/.*"v([^"]+)".*/\1/')} \
-    && curl -L -O https://github.com/actions/runner/releases/download/v${GH_RUNNER_VERSION}/actions-runner-linux-x64-${GH_RUNNER_VERSION}.tar.gz \
-    && tar -zxf actions-runner-linux-x64-${GH_RUNNER_VERSION}.tar.gz \
-    && rm -f actions-runner-linux-x64-${GH_RUNNER_VERSION}.tar.gz \
-    && ./bin/installdependencies.sh \
-    && chown -R root: /home/runner \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean
+ARG GH_RUNNER_VERSION
+RUN set -x && \
+    apt-get update && \
+    packages="build-essential zlib1g-dev liblttng-ust0 libcurl4-openssl-dev openssh-client" && \
+    apt-get install --assume-yes ${packages} && \
+    GH_RUNNER_VERSION=${GH_RUNNER_VERSION:-$(curl --silent "https://api.github.com/repos/actions/runner/releases/latest" | jq -r .tag_name | sed -E 's/v([^"]+)/\1/')} && \
+    curl --fail --show-error --location --remote-name https://github.com/actions/runner/releases/download/v${GH_RUNNER_VERSION}/actions-runner-linux-x64-${GH_RUNNER_VERSION}.tar.gz && \
+    tar -zxf actions-runner-linux-x64-${GH_RUNNER_VERSION}.tar.gz && \
+    rm actions-runner-linux-x64-${GH_RUNNER_VERSION}.tar.gz && \
+    ./bin/installdependencies.sh && \
+    chown --recursive root: /home/runner && \
+    apt-get purge --assume-yes --auto-remove ${packages} && \
+    rm --recursive --force /var/lib/apt/lists/* && \
+    apt-get clean
+
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+RUN chmod 644 /etc/supervisor/conf.d/supervisord.conf
 
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
+
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

docker/hooks/build

@@ -8,7 +8,7 @@ set -ex
 # DOCKER_TAG can be : latest, ubuntu-20.04, v1.0.0, v1.0.0-ubuntu-20.04
 
 if [[ $DOCKER_TAG =~ ^(latest|v[0-9]+\.[0-9]+\.[0-9]+)$ ]]; then
-    TAG=debian-buster-slim
+    TAG=debian-bullseye-slim
 else
     # Remove vX.X.X- suffix
     TAG=$(echo $DOCKER_TAG | sed 's/v[0-9]\+.[0-9]\+.[0-9]\+-//')