Skip to content

Commit 67cedf1

Browse files
committed
CentOS 8 is EOL, use CentOS Stream 8
1 parent 5ba93d4 commit 67cedf1

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
image: centos7-builder:${{ github.sha }}
131131
run: /build.sh
132132
options: -v ${{ github.workspace }}/build/package/rpm:/rpm -v ${{ github.workspace }}/build_output:/build_output
133-
- name: Build Image Centos 8
133+
- name: Build Image Centos stream 8
134134
uses: docker/build-push-action@v2
135135
with:
136136
file: build/Dockerfile
@@ -139,14 +139,14 @@ jobs:
139139
load: true
140140
cache-from: type=gha
141141
cache-to: type=gha,mode=max
142-
tags: centos8-builder:${{ github.sha }}
142+
tags: centosstream8-builder:${{ github.sha }}
143143
build-args: |
144-
CONTAINER_VERSION=centos:8
144+
CONTAINER_VERSION=quay.io/centos/centos:stream8
145145
OS_TYPE=rpm_based
146-
- name: Run Centos 8
146+
- name: Run Centos stream 8
147147
uses: addnab/docker-run-action@v3
148148
with:
149-
image: centos8-builder:${{ github.sha }}
149+
image: centosstream8-builder:${{ github.sha }}
150150
run: /build.sh
151151
options: -v ${{ github.workspace }}/build/package/rpm:/rpm -v ${{ github.workspace }}/build_output:/build_output
152152
- name: Build Image Debian

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ TARGET ?= local
22

33
export DOCKER_BUILDKIT = 1
44

5-
all: amazon amazon2 centos7 centos8 debian
5+
all: amazon amazon2 centos7 centosstream8 debian
66

77
.PHONY: test
88
test:
@@ -31,9 +31,9 @@ centos7: build
3131
docker build -t centos7-builder --target ${TARGET} --build-arg CONTAINER_VERSION=centos:7 --build-arg OS_TYPE=rpm_based -f build/Dockerfile .
3232
docker run --rm -v $(shell pwd)/build/package/rpm:/rpm -v $(shell pwd)/build_output:/build_output centos7-builder
3333

34-
centos8: build
35-
docker build -t centos8-builder --target ${TARGET} --build-arg CONTAINER_VERSION=centos:8 --build-arg OS_TYPE=rpm_based -f build/Dockerfile .
36-
docker run --rm -v $(shell pwd)/build/package/rpm:/rpm -v $(shell pwd)/build_output:/build_output centos8-builder
34+
centosstream8: build
35+
docker build -t centosstream8-builder --target ${TARGET} --build-arg CONTAINER_VERSION=quay.io/centos/centos:stream8 --build-arg OS_TYPE=rpm_based -f build/Dockerfile .
36+
docker run --rm -v $(shell pwd)/build/package/rpm:/rpm -v $(shell pwd)/build_output:/build_output centosstream8-builder
3737

3838
debian: build
3939
docker build -t debian-builder --target ${TARGET} --build-arg OS_TYPE=deb_based -f build/Dockerfile .

0 commit comments

Comments
 (0)