Skip to content

Commit

Permalink
base: don't specify Debian version in image name.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
ericonr committed Dec 9, 2024
1 parent 8ba1cc4 commit 258690a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/base-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

Expand Down
2 changes: 1 addition & 1 deletion base/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 258690a

Please sign in to comment.