diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 2872e3b..f3b7538 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - image-name: ['ubuntu-2204', 'ubuntu-2404'] + image-name: ['ubuntu-2204', 'debian-12.6-slim'] steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 diff --git a/build_image.py b/build_image.py index 25b7059..ae6afbf 100644 --- a/build_image.py +++ b/build_image.py @@ -48,7 +48,7 @@ def build_image(image_name: str, tag: str, image_path: typing.Optional[pathlib.P image_path = image_path.relative_to(cwd) subprocess.run( - f"podman build -t {image_name}:{tag} -f {str(image_path)}", + f"podman build --no-cache -t {image_name}:{tag} -f {str(image_path)}", shell=True, check=True, cwd=cwd, diff --git a/images/ubuntu-2404/Dockerfile b/images/debian-12.6-slim/Dockerfile similarity index 54% rename from images/ubuntu-2404/Dockerfile rename to images/debian-12.6-slim/Dockerfile index b848772..7380189 100644 --- a/images/ubuntu-2404/Dockerfile +++ b/images/debian-12.6-slim/Dockerfile @@ -1,7 +1,4 @@ -FROM ubuntu:24.04 as skeleton - -ENV NODE_VERSION "20.12.2" -ENV NVM_VERSION "0.37.2" +FROM debian:12.6-slim as skeleton ENV DEBIAN_FRONTEND noninteractive ENV TZ Etc/UTC @@ -15,8 +12,9 @@ RUN apt update && \ git \ xz-utils \ ca-certificates \ + nodejs \ + npm \ python3 \ - python3-venv \ python3-pip \ pipx \ --no-install-recommends \ @@ -28,17 +26,3 @@ COPY ./files/registries.conf /etc/containers/registries.conf FROM skeleton as runner WORKDIR /runner - -RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v$NVM_VERSION/install.sh | bash - -RUN . $HOME/.nvm/nvm.sh && \ - nvm install $NODE_VERSION && \ - nvm use $NODE_VERSION && \ - nvm cache clear - -ENV NVM_DIR $HOME/.nvm -ENV PATH /root/.nvm/versions/node/v$NODE_VERSION/bin:$PATH - -RUN node --version - -RUN corepack enable diff --git a/images/ubuntu-2404/files/registries.conf b/images/debian-12.6-slim/files/registries.conf similarity index 100% rename from images/ubuntu-2404/files/registries.conf rename to images/debian-12.6-slim/files/registries.conf