Skip to content

Commit 577c9a0

Browse files
committed
CentOS 8 is EOL, use CentOS Stream 8
1 parent fe06996 commit 577c9a0

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
@@ -111,7 +111,7 @@ jobs:
111111
image: centos7-builder:${{ github.sha }}
112112
run: /build.sh
113113
options: -v ${{ github.workspace }}/build/package/rpm:/rpm -v ${{ github.workspace }}/build_output:/build_output
114-
- name: Build Image Centos 8
114+
- name: Build Image Centos stream 8
115115
uses: docker/build-push-action@v2
116116
with:
117117
file: build/Dockerfile
@@ -120,14 +120,14 @@ jobs:
120120
load: true
121121
cache-from: type=gha
122122
cache-to: type=gha,mode=max
123-
tags: centos8-builder:${{ github.sha }}
123+
tags: centosstream8-builder:${{ github.sha }}
124124
build-args: |
125-
CONTAINER_VERSION=centos:8
125+
CONTAINER_VERSION=quay.io/centos/centos:stream8
126126
OS_TYPE=rpm_based
127-
- name: Run Centos 8
127+
- name: Run Centos stream 8
128128
uses: addnab/docker-run-action@v3
129129
with:
130-
image: centos8-builder:${{ github.sha }}
130+
image: centosstream8-builder:${{ github.sha }}
131131
run: /build.sh
132132
options: -v ${{ github.workspace }}/build/package/rpm:/rpm -v ${{ github.workspace }}/build_output:/build_output
133133
- 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: amazon2 centos7 centos8 debian
5+
all: amazon2 centos7 centosstream8 debian
66

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

30-
centos8: build
31-
docker build -t centos8-builder --target ${TARGET} --build-arg CONTAINER_VERSION=centos:8 --build-arg OS_TYPE=rpm_based -f build/Dockerfile .
32-
docker run --rm -v $(shell pwd)/build/package/rpm:/rpm -v $(shell pwd)/build_output:/build_output centos8-builder
30+
centosstream8: build
31+
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 .
32+
docker run --rm -v $(shell pwd)/build/package/rpm:/rpm -v $(shell pwd)/build_output:/build_output centosstream8-builder
3333

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

0 commit comments

Comments
 (0)