diff --git a/images/rootless-ubuntu-jammy.Dockerfile b/images/rootless-ubuntu-jammy.Dockerfile index 50ccf20..8986055 100644 --- a/images/rootless-ubuntu-jammy.Dockerfile +++ b/images/rootless-ubuntu-jammy.Dockerfile @@ -1,12 +1,12 @@ FROM ubuntu:22.04 # GitHub runner arguments -ARG RUNNER_VERSION=2.316.0 +ARG RUNNER_VERSION=2.316.1 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.0 # Docker and Compose arguments -ARG DOCKER_VERSION=26.1.0 -ARG COMPOSE_VERSION=v2.26.0 +ARG DOCKER_VERSION=26.1.1 +ARG COMPOSE_VERSION=v2.27.0 # Dumb-init version ARG DUMB_INIT_VERSION=1.2.5 @@ -68,10 +68,10 @@ RUN apt-get update \ RUN adduser --disabled-password --gecos "" --uid 1000 runner # Make and set the working directory -RUN mkdir -p /actions-runner \ - && chown -R $USERNAME:$GID /actions-runner +RUN mkdir -p /home/runner \ + && chown -R $USERNAME:$GID /home/runner -WORKDIR /actions-runner +WORKDIR /home/runner # Install GitHub CLI COPY images/software/gh-cli.sh /gh-cli.sh @@ -117,16 +117,11 @@ RUN ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \ && curl -f -L -o /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_${ARCH} \ && chmod +x /usr/local/bin/dumb-init -# We place the scripts in `/usr/bin` so that users who extend this image can -# override them with scripts of the same name placed in `/usr/local/bin`. -COPY images/startup.sh images/logger.sh /usr/bin/ -RUN chmod +x /usr/bin/startup.sh - # Make the rootless runner directory and externals directory executable -RUN mkdir /run/user/1000 \ +RUN mkdir -p /run/user/1000 \ && chown runner:runner /run/user/1000 \ && chmod a+x /run/user/1000 \ - && mkdir /home/runner/externals \ + && mkdir -p /home/runner/externals \ && chown runner:runner /home/runner/externals \ && chmod a+x /home/runner/externals @@ -144,4 +139,3 @@ RUN curl --create-dirs -L "https://github.com/docker/compose/releases/download/$ chmod +x /home/runner/bin/docker-compose ENTRYPOINT ["/usr/local/bin/dumb-init", "--"] -CMD ["startup.sh"] \ No newline at end of file diff --git a/images/ubi8.Dockerfile b/images/ubi8.Dockerfile index d5e42a8..d9f0b6a 100644 --- a/images/ubi8.Dockerfile +++ b/images/ubi8.Dockerfile @@ -10,7 +10,7 @@ LABEL org.opencontainers.image.documentation https://github.com/some-natalie/kub # Arguments ARG TARGETPLATFORM -ARG RUNNER_VERSION=2.316.0 +ARG RUNNER_VERSION=2.316.1 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.0 # Shell setup @@ -77,11 +77,4 @@ RUN curl -f -L -o runner-container-hooks.zip https://github.com/actions/runner-c && unzip ./runner-container-hooks.zip -d ./k8s \ && rm runner-container-hooks.zip -# Copy in custom logger and startup script -COPY images/logger.sh images/startup.sh /usr/bin/ -RUN chmod +x /usr/bin/startup.sh \ - && chown -R $USERNAME:$UID /home/runner - USER $USERNAME - -CMD ["startup.sh"] diff --git a/images/ubi9.Dockerfile b/images/ubi9.Dockerfile index 26cdc74..62518c5 100644 --- a/images/ubi9.Dockerfile +++ b/images/ubi9.Dockerfile @@ -10,7 +10,7 @@ LABEL org.opencontainers.image.documentation https://github.com/some-natalie/kub # Arguments ARG TARGETPLATFORM -ARG RUNNER_VERSION=2.316.0 +ARG RUNNER_VERSION=2.316.1 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.0 # Shell setup @@ -77,11 +77,5 @@ RUN curl -f -L -o runner-container-hooks.zip https://github.com/actions/runner-c && unzip ./runner-container-hooks.zip -d ./k8s \ && rm runner-container-hooks.zip -# Copy in custom logger and startup script -COPY images/logger.sh images/startup.sh /usr/bin/ -RUN chmod +x /usr/bin/startup.sh \ - && chown -R $USERNAME:$UID /home/runner - USER $USERNAME -CMD ["startup.sh"] diff --git a/images/wolfi.Dockerfile b/images/wolfi.Dockerfile index 121f52d..c6ac357 100644 --- a/images/wolfi.Dockerfile +++ b/images/wolfi.Dockerfile @@ -10,7 +10,7 @@ LABEL org.opencontainers.image.documentation https://github.com/some-natalie/kub # Arguments ARG TARGETPLATFORM -ARG RUNNER_VERSION=2.316.0 +ARG RUNNER_VERSION=2.316.1 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.0 ARG DOTNET_VERSION=7 @@ -72,11 +72,4 @@ ENV ACTIONS_RUNNER_PRINT_LOG_TO_STDOUT=1 # configure directory permissions; ref https://github.com/actions/runner-images/blob/main/images/ubuntu/scripts/build/configure-system.sh RUN chmod -R 777 /opt /usr/share -# Copy in custom logger and startup script -COPY images/logger.sh images/startup.sh /usr/bin/ -RUN chmod +x /usr/bin/startup.sh \ - && chown -R runner:runner /home/runner - USER runner - -CMD ["startup.sh"]