From 258690a01f969a98d9e3a2400329bf56bd4586c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Tue, 3 Dec 2024 18:33:35 -0300 Subject: [PATCH] base: don't specify Debian version in image name. We have no intention of maintaining images with more than one Debian version, and having the Debian version in the name simply makes version updates more complicated. This change isn't mentioned in the changelog because it's transparent to users, who should be using the provided Dockerfile. --- .github/workflows/base-image.yml | 4 ++-- Dockerfile | 2 +- README.md | 2 +- base/docker-compose.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/base-image.yml b/.github/workflows/base-image.yml index 71249f9..2f68f12 100644 --- a/.github/workflows/base-image.yml +++ b/.github/workflows/base-image.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: image: - - { dir: base, name: lnls-debian-11-epics-7 } + - { dir: base, name: lnls-debian-epics-7 } - { dir: base/musl, name: lnls-alpine-3-epics-7 } env: TAG: ${{ github.event_name == 'push' && github.ref_name || github.head_ref }} @@ -52,7 +52,7 @@ jobs: with: driver: docker - name: Build and push included IOC images - if: ${{ matrix.image.name == 'lnls-debian-11-epics-7' }} + if: ${{ matrix.image.name == 'lnls-debian-epics-7' }} uses: docker/bake-action@v5 with: workdir: images/ diff --git a/Dockerfile b/Dockerfile index 6e8c8bf..66a62f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG DEBIAN_VERSION=11.9 -FROM ghcr.io/cnpem/lnls-debian-11-epics-7:v0.12.0-dev AS build-image +FROM ghcr.io/cnpem/lnls-debian-epics-7:v0.12.0-dev AS build-image FROM debian:${DEBIAN_VERSION}-slim AS base diff --git a/README.md b/README.md index 7e077ba..add2bc5 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ build thin IOC container images. ## Base image The base image is built in CI and should be obtained directly from the [GitHub -registry](https://github.com/cnpem/epics-in-docker/pkgs/container/lnls-debian-11-epics-7). +registry](https://github.com/cnpem/epics-in-docker/pkgs/container/lnls-debian-epics-7). The versions used in the base image are defined in `base/.env`. diff --git a/base/docker-compose.yml b/base/docker-compose.yml index ef8c1e9..4dcd596 100644 --- a/base/docker-compose.yml +++ b/base/docker-compose.yml @@ -1,6 +1,6 @@ services: epics-base: - image: ${REGISTRY:-ghcr.io/cnpem}/lnls-debian-11-epics-7:$TAG + image: ${REGISTRY:-ghcr.io/cnpem}/lnls-debian-epics-7:$TAG build: context: ./ dockerfile: Dockerfile