Skip to content

Commit

Permalink
Add 24.04 base/actions image
Browse files Browse the repository at this point in the history
  • Loading branch information
bloodearnest committed Oct 22, 2024
1 parent 5605a02 commit 9e1d42d
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/build_and_publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,18 @@ jobs:
# tag the local images with the published names
docker tag $BASE_IMAGE_NAME:20.04 $BASE_IMAGE_ID:20.04
docker tag $BASE_IMAGE_NAME:22.04 $BASE_IMAGE_ID:22.04
docker tag $BASE_IMAGE_NAME:24.04 $BASE_IMAGE_ID:24.04
docker tag $ACTION_IMAGE_NAME:20.04 $ACTION_IMAGE_ID:20.04
docker tag $ACTION_IMAGE_NAME:22.04 $ACTION_IMAGE_ID:22.04
docker tag $ACTION_IMAGE_NAME:24.04 $ACTION_IMAGE_ID:24.04
# push each label up
docker push $BASE_IMAGE_ID:20.04
docker push $BASE_IMAGE_ID:22.04
docker push $BASE_IMAGE_ID:24.04
docker push $ACTION_IMAGE_ID:20.04
docker push $ACTION_IMAGE_ID:22.04
docker push $ACTION_IMAGE_ID:24.04
# latest tags are 20.04 for b/w compat
docker tag $BASE_IMAGE_NAME:20.04 $BASE_IMAGE_ID:latest
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export BASE_GITREF=$(shell git rev-parse --short HEAD)


build:
docker compose build --pull $(ARGS) base-docker-20.04 base-docker-22.04 base-action-20.04 base-action-22.04
docker compose build --pull $(ARGS)

clean-build: ARGS=--no-cache
clean-build: build
15 changes: 14 additions & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ services:
args:
- UBUNTU_VERSION=ubuntu:22.04

base-docker-24.04:
extends: base-docker
image: "base-docker:24.04"
build:
args:
- UBUNTU_VERSION=ubuntu:24.04

base-action-20.04:
extends: base-docker
image: "base-action:20.04"
Expand All @@ -43,4 +50,10 @@ services:
- UBUNTU_VERSION=ubuntu:22.04
target: base-action


base-action-24.04:
extends: base-docker
image: "base-action:24.04"
build:
args:
- UBUNTU_VERSION=ubuntu:24.04
target: base-action

0 comments on commit 9e1d42d

Please sign in to comment.