File tree Expand file tree Collapse file tree 3 files changed +10
-10
lines changed Expand file tree Collapse file tree 3 files changed +10
-10
lines changed Original file line number Diff line number Diff line change @@ -111,7 +111,7 @@ jobs:
111
111
image : centos7-builder:${{ github.sha }}
112
112
run : /build.sh
113
113
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
115
115
uses : docker/build-push-action@v2
116
116
with :
117
117
file : build/Dockerfile
@@ -120,14 +120,14 @@ jobs:
120
120
load : true
121
121
cache-from : type=gha
122
122
cache-to : type=gha,mode=max
123
- tags : centos8 -builder:${{ github.sha }}
123
+ tags : centosstream8 -builder:${{ github.sha }}
124
124
build-args : |
125
- CONTAINER_VERSION=centos:8
125
+ CONTAINER_VERSION=quay.io/ centos/centos:stream8
126
126
OS_TYPE=rpm_based
127
- - name : Run Centos 8
127
+ - name : Run Centos stream 8
128
128
uses : addnab/docker-run-action@v3
129
129
with :
130
- image : centos8 -builder:${{ github.sha }}
130
+ image : centosstream8 -builder:${{ github.sha }}
131
131
run : /build.sh
132
132
options : -v ${{ github.workspace }}/build/package/rpm:/rpm -v ${{ github.workspace }}/build_output:/build_output
133
133
- name : Build Image Debian
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ TARGET ?= local
2
2
3
3
export DOCKER_BUILDKIT = 1
4
4
5
- all : amazon2 centos7 centos8 debian
5
+ all : amazon2 centos7 centosstream8 debian
6
6
7
7
.PHONY : test
8
8
test :
@@ -27,9 +27,9 @@ centos7: build
27
27
docker build -t centos7-builder --target ${TARGET} --build-arg CONTAINER_VERSION=centos:7 --build-arg OS_TYPE=rpm_based -f build/Dockerfile .
28
28
docker run --rm -v $(shell pwd) /build/package/rpm:/rpm -v $(shell pwd) /build_output:/build_output centos7-builder
29
29
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
33
33
34
34
debian : build
35
35
docker build -t debian-builder --target ${TARGET} --build-arg OS_TYPE=deb_based -f build/Dockerfile .
Original file line number Diff line number Diff line change @@ -165,7 +165,7 @@ To build a software package, run: `$ make <os>`
165
165
where ` <os> ` is the target OS. The following values are allowed:
166
166
* ` amazon2 ` for Amazon Linux 2
167
167
* ` centos7 ` for CentOS7/RHEL7
168
- * ` centos8 ` for CentOS8 /RHEL8
168
+ * ` centosstream8 ` for CentOS Stream 8 /RHEL8
169
169
* ` debian ` for Ubuntu >= 16.04 and Debian 9/10
170
170
171
171
by default the nginx-asg-sync binary will be built locally, to build it inside a Docker container add the ` TARGET ` parameter to ` make ` , for example:
You can’t perform that action at this time.
0 commit comments