diff --git a/.env b/.env index 61b7309..3260fb8 100755 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ # target REG=zima1.abutili.net:3002 NS=images -IMG=base-act +IMG=act-base diff --git a/Dockerfile b/Dockerfile index 0cf9108..088553c 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,22 @@ -# Small, glibc-based; great compat -FROM debian:trixie-slim +FROM zima1.abutili.net:3002/images/base:latest + +USER root ARG VERSION=dev ARG VCS_REF=unknown ARG BUILD_DATE=unknown ARG NODE_VERSION=24.14.1 -LABEL org.opencontainers.image.title="base-act" \ +LABEL org.opencontainers.image.title="act-base" \ org.opencontainers.image.version="${VERSION}" \ org.opencontainers.image.revision="${VCS_REF}" \ org.opencontainers.image.created="${BUILD_DATE}" \ - org.opencontainers.image.source="https://git.abutili.net/images/base-act" + org.opencontainers.image.source="https://git.abutili.net/images/act-base" # install system deps RUN apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates curl bash jq xz-utils git openssh-client \ + jq xz-utils git openssh-client \ + && apt-get clean \ && rm -rf /var/lib/apt/lists/* RUN set -eux; \ @@ -26,11 +28,5 @@ RUN set -eux; \ # install app -# Non-root user (safer) -RUN useradd -ms /bin/bash runner +# Switch back to the runner user defined in the base image USER runner -WORKDIR /workspace - -# Default shell -SHELL ["/bin/bash", "-eo", "pipefail", "-c"] -# ENTRYPOINT