Skip to content

Commit 3b350da

Browse files
LiteSunLiteSun
committed
chore: update base image to ubi 9.6 across all Dockerfiles and CI configurations
1 parent 09a99d3 commit 3b350da

12 files changed

+40
-40
lines changed

‎.circleci/config.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ jobs:
2121
- run:
2222
name: build apisix-runtime rpm
2323
command: |
24-
make package type=rpm app=apisix-runtime runtime_version=${BUILD_APISIX_RUNTIME_VERSION} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6
24+
make package type=rpm app=apisix-runtime runtime_version=${BUILD_APISIX_RUNTIME_VERSION} image_base=registry.access.redhat.com/ubi9/ubi image_tag=9.6
2525
- run:
26-
name: run ubi8 docker and mapping apisix-runtime rpm into container
26+
name: run ubi9 docker and mapping apisix-runtime rpm into container
2727
command: |
28-
docker run -itd -v /home/runner/work/apisix-build-tools/apisix-build-tools/output:/output --name ubiInstance --net="host" registry.access.redhat.com/ubi8/ubi:8.6 /bin/bash
28+
docker run -itd -v /home/runner/work/apisix-build-tools/apisix-build-tools/output:/output --name ubiInstance --net="host" registry.access.redhat.com/ubi9/ubi:9.6 /bin/bash
2929
- run:
3030
name: install rpm in container
3131
command: |
3232
docker exec ubiInstance bash -c "ls -la /output"
33-
docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-runtime-${BUILD_APISIX_RUNTIME_VERSION}-0.ubi8.6.x86_64.rpm"
33+
docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-runtime-${BUILD_APISIX_RUNTIME_VERSION}-0.ubi9.6.x86_64.rpm"
3434
- run:
3535
name: check and ensure apisix-runtime is installed
3636
command: |

‎.github/workflows/package-apisix-rpm-ubi.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,18 @@ jobs:
4343
- name: packaging APISIX(-remote) with remote code
4444
run: |
4545
wget https://raw.githubusercontent.com/apache/apisix/${APISIX_VERSION}/.requirements && source .requirements
46-
make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} runtime_version=${APISIX_RUNTIME} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6 artifact=apisix-remote
46+
make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} runtime_version=${APISIX_RUNTIME} image_base=registry.access.redhat.com/ubi9/ubi image_tag=9.6 artifact=apisix-remote
4747
4848
- name: packaging APISIX(-local) with local code
4949
run: |
5050
wget https://raw.githubusercontent.com/apache/apisix/${APISIX_VERSION}/.requirements && source .requirements
5151
git clone -b ${APISIX_VERSION} https://github.com/apache/apisix.git
5252
./build-apisix-dashboard.sh ./apisix
53-
make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} runtime_version=${APISIX_RUNTIME} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6 local_code_path=./apisix artifact=apisix-local
53+
make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} runtime_version=${APISIX_RUNTIME} image_base=registry.access.redhat.com/ubi9/ubi image_tag=9.6 local_code_path=./apisix artifact=apisix-local
5454
55-
- name: run ubi8 docker and mapping rpm into container
55+
- name: run ubi9 docker and mapping rpm into container
5656
run: |
57-
docker run -itd -v $PWD/output:/output -v $(pwd)/test/apisix/config.yaml:/usr/local/apisix/conf/config.yaml --name ubiInstance --net="host" registry.access.redhat.com/ubi8/ubi:8.6 /bin/bash
57+
docker run -itd -v $PWD/output:/output -v $(pwd)/test/apisix/config.yaml:/usr/local/apisix/conf/config.yaml --name ubiInstance --net="host" registry.access.redhat.com/ubi9/ubi:9.6 /bin/bash
5858
5959
- name: enable apisix repository in container
6060
run: |
@@ -63,7 +63,7 @@ jobs:
6363
6464
- name: install APISIX(-remote) master by rpm in container
6565
run: |
66-
docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-remote-master-0.ubi8.6.x86_64.rpm"
66+
docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-remote-master-0.ubi9.6.x86_64.rpm"
6767
docker exec ubiInstance bash -c "apisix start"
6868
6969
- name: check and ensure APISIX(-remote) master is installed
@@ -82,7 +82,7 @@ jobs:
8282
8383
- name: install APISIX(-local) by rpm in container
8484
run: |
85-
docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-local-master-0.ubi8.6.x86_64.rpm"
85+
docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-local-master-0.ubi9.6.x86_64.rpm"
8686
docker exec ubiInstance bash -c "apisix start"
8787
8888
- name: check and ensure APISIX(-local) is installed
@@ -102,7 +102,7 @@ jobs:
102102
- name: Publish Artifact
103103
uses: actions/[email protected]
104104
with:
105-
name: apisix-remote-master-0.ubi8.6.x86_64.rpm
106-
path: output/apisix-remote-master-0.ubi8.6.x86_64.rpm
105+
name: apisix-remote-master-0.ubi9.6.x86_64.rpm
106+
path: output/apisix-remote-master-0.ubi9.6.x86_64.rpm
107107
retention-days: 5
108108
if-no-files-found: error

‎.github/workflows/package-apisix-runtime-rpm-ubi.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ jobs:
2727
2828
- name: build apisix-runtime rpm
2929
run: |
30-
make package type=rpm app=apisix-runtime runtime_version=${BUILD_APISIX_RUNTIME_VERSION} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6
30+
make package type=rpm app=apisix-runtime runtime_version=${BUILD_APISIX_RUNTIME_VERSION} image_base=registry.access.redhat.com/ubi9/ubi image_tag=9.6
3131
32-
- name: run ubi8 docker and mapping apisix-runtime rpm into container
32+
- name: run ubi9 docker and mapping apisix-runtime rpm into container
3333
run: |
34-
docker run -itd -v /home/runner/work/apisix-build-tools/apisix-build-tools/output:/output --name ubiInstance --net="host" registry.access.redhat.com/ubi8/ubi:8.6 /bin/bash
34+
docker run -itd -v /home/runner/work/apisix-build-tools/apisix-build-tools/output:/output --name ubiInstance --net="host" registry.access.redhat.com/ubi9/ubi:9.6 /bin/bash
3535
3636
- name: install rpm in container
3737
run: |
3838
docker exec ubiInstance bash -c "ls -la /output"
39-
docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-runtime-${BUILD_APISIX_RUNTIME_VERSION}-0.ubi8.6.x86_64.rpm"
39+
docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-runtime-${BUILD_APISIX_RUNTIME_VERSION}-0.ubi9.6.x86_64.rpm"
4040
4141
- name: check and ensure apisix-runtime is installed
4242
run: |
@@ -47,7 +47,7 @@ jobs:
4747
- name: Publish Artifact
4848
uses: actions/[email protected]
4949
with:
50-
name: apisix-runtime-${{ env.BUILD_APISIX_RUNTIME_VERSION }}-0.ubi8.6.x86_64.rpm
51-
path: output/apisix-runtime-${{ env.BUILD_APISIX_RUNTIME_VERSION }}-0.ubi8.6.x86_64.rpm
50+
name: apisix-runtime-${{ env.BUILD_APISIX_RUNTIME_VERSION }}-0.ubi9.6.x86_64.rpm
51+
path: output/apisix-runtime-${{ env.BUILD_APISIX_RUNTIME_VERSION }}-0.ubi9.6.x86_64.rpm
5252
retention-days: 5
5353
if-no-files-found: error

‎.github/workflows/publish.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ jobs:
7676
source .requirements
7777
7878
# build apisix
79-
make package type=rpm app=apisix openresty=apisix-runtime runtime_version=${APISIX_RUNTIME} checkout=${APISIX_TAG_VERSION} version=${APISIX_TAG_VERSION} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6
80-
mv ./output/apisix-${APISIX_TAG_VERSION}-0.ubi8.6.${ARCH}.rpm ${VAR_RPM_WORKBENCH_DIR}
79+
make package type=rpm app=apisix openresty=apisix-runtime runtime_version=${APISIX_RUNTIME} checkout=${APISIX_TAG_VERSION} version=${APISIX_TAG_VERSION} image_base=registry.access.redhat.com/ubi9/ubi image_tag=9.6
80+
mv ./output/apisix-${APISIX_TAG_VERSION}-0.ubi9.6.${ARCH}.rpm ${VAR_RPM_WORKBENCH_DIR}
8181
echo "TARGET_APP=apisix" >> "$GITHUB_ENV"
8282
8383
- name: Build apisix-base RPM Package
@@ -87,8 +87,8 @@ jobs:
8787
run: |
8888
# build apisix-base
8989
echo ${{ env.TAG_TYPE }} ${{ env.TAG_VERSION }}
90-
make package type=rpm app=apisix-base checkout=${APISIX_BASE_TAG_VERSION} version=${APISIX_BASE_TAG_VERSION} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6
91-
mv ./output/apisix-base-${APISIX_BASE_TAG_VERSION}-0.ubi8.6.${ARCH}.rpm ${VAR_RPM_WORKBENCH_DIR}
90+
make package type=rpm app=apisix-base checkout=${APISIX_BASE_TAG_VERSION} version=${APISIX_BASE_TAG_VERSION} image_base=registry.access.redhat.com/ubi9/ubi image_tag=9.6
91+
mv ./output/apisix-base-${APISIX_BASE_TAG_VERSION}-0.ubi9.6.${ARCH}.rpm ${VAR_RPM_WORKBENCH_DIR}
9292
echo "TARGET_APP=apisix-base" >> "$GITHUB_ENV"
9393
9494
- name: Build apisix-runtime RPM Package
@@ -98,8 +98,8 @@ jobs:
9898
run: |
9999
# build apisix-runtime
100100
echo ${{ env.TAG_TYPE }} ${{ env.TAG_VERSION }}
101-
make package type=rpm app=apisix-runtime checkout=${APISIX_RUNTIME_TAG_VERSION} version=${APISIX_RUNTIME_TAG_VERSION} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6
102-
mv ./output/apisix-runtime-${APISIX_RUNTIME_TAG_VERSION}-0.ubi8.6.${ARCH}.rpm ${VAR_RPM_WORKBENCH_DIR}
101+
make package type=rpm app=apisix-runtime checkout=${APISIX_RUNTIME_TAG_VERSION} version=${APISIX_RUNTIME_TAG_VERSION} image_base=registry.access.redhat.com/ubi9/ubi image_tag=9.6
102+
mv ./output/apisix-runtime-${APISIX_RUNTIME_TAG_VERSION}-0.ubi9.6.${ARCH}.rpm ${VAR_RPM_WORKBENCH_DIR}
103103
echo "TARGET_APP=apisix-runtime" >> "$GITHUB_ENV"
104104
105105
- name: Build apisix-dashboard RPM Package
@@ -120,7 +120,7 @@ jobs:
120120
if: ${{ env.TAG_TYPE == 'apisix' }}
121121
uses: actions/[email protected]
122122
env:
123-
PACKAGE_NAME: apisix-${{ env.TAG_VERSION }}-0.ubi8.6.${{ env.ARCH }}.rpm
123+
PACKAGE_NAME: apisix-${{ env.TAG_VERSION }}-0.ubi9.6.${{ env.ARCH }}.rpm
124124
with:
125125
name: "${{ env.PACKAGE_NAME }}"
126126
path: "${{ env.VAR_RPM_WORKBENCH_DIR }}/${{ env.PACKAGE_NAME }}"
@@ -129,7 +129,7 @@ jobs:
129129
if: ${{ env.TAG_TYPE == 'apisix-base' }}
130130
uses: actions/[email protected]
131131
env:
132-
PACKAGE_NAME: apisix-base-${{ env.TAG_VERSION }}-0.ubi8.6.${{ env.ARCH }}.rpm
132+
PACKAGE_NAME: apisix-base-${{ env.TAG_VERSION }}-0.ubi9.6.${{ env.ARCH }}.rpm
133133
with:
134134
name: "${{ env.PACKAGE_NAME }}"
135135
path: "${{ env.VAR_RPM_WORKBENCH_DIR }}/${{ env.PACKAGE_NAME }}"
@@ -138,7 +138,7 @@ jobs:
138138
if: ${{ env.TAG_TYPE == 'apisix-runtime' }}
139139
uses: actions/[email protected]
140140
env:
141-
PACKAGE_NAME: apisix-runtime-${{ env.TAG_VERSION }}-0.ubi8.6.${{ env.ARCH }}.rpm
141+
PACKAGE_NAME: apisix-runtime-${{ env.TAG_VERSION }}-0.ubi9.6.${{ env.ARCH }}.rpm
142142
with:
143143
name: "${{ env.PACKAGE_NAME }}"
144144
path: "${{ env.VAR_RPM_WORKBENCH_DIR }}/${{ env.PACKAGE_NAME }}"

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ version=0
1919
checkout=0
2020
app=0
2121
type=0
22-
image_base="registry.access.redhat.com/ubi8/ubi"
23-
image_tag="8.6"
22+
image_base="registry.access.redhat.com/ubi9/ubi"
23+
image_tag="9.6"
2424
iteration=0
2525
local_code_path=0
2626
openresty="apisix-runtime"

‎dockerfiles/Dockerfile.apisix-base.rpm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG IMAGE_BASE="registry.access.redhat.com/ubi8/ubi"
2-
ARG IMAGE_TAG="8.6"
1+
ARG IMAGE_BASE="registry.access.redhat.com/ubi9/ubi"
2+
ARG IMAGE_TAG="9.6"
33

44
FROM ${IMAGE_BASE}:${IMAGE_TAG}
55

‎dockerfiles/Dockerfile.apisix-runtime.rpm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG IMAGE_BASE="registry.access.redhat.com/ubi8/ubi"
2-
ARG IMAGE_TAG="8.6"
1+
ARG IMAGE_BASE="registry.access.redhat.com/ubi9/ubi"
2+
ARG IMAGE_TAG="9.6"
33

44
FROM ${IMAGE_BASE}:${IMAGE_TAG}
55

‎dockerfiles/Dockerfile.apisix.rpm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG IMAGE_BASE="registry.access.redhat.com/ubi8/ubi"
2-
ARG IMAGE_TAG="8.6"
1+
ARG IMAGE_BASE="registry.access.redhat.com/ubi9/ubi"
2+
ARG IMAGE_TAG="9.6"
33

44
ARG PACKAGE_TYPE
55
ARG RUNTIME_VERSION

‎dockerfiles/Dockerfile.dashboard.rpm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG IMAGE_BASE="registry.access.redhat.com/ubi8/ubi"
2-
ARG IMAGE_TAG="8.6"
1+
ARG IMAGE_BASE="registry.access.redhat.com/ubi9/ubi"
2+
ARG IMAGE_TAG="9.6"
33

44
FROM ${IMAGE_BASE}:${IMAGE_TAG}
55

‎utils/determine-dist.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ then
88
elif [ "${IMAGE_BASE}" == "debian" ]
99
then
1010
dist="${IMAGE_BASE}${IMAGE_TAG}"
11-
elif [ "${IMAGE_BASE}" == "registry.access.redhat.com/ubi8/ubi" ]
11+
elif [ "${IMAGE_BASE}" == "registry.access.redhat.com/ubi9/ubi" ]
1212
then
1313
dist="ubi${IMAGE_TAG}"
1414
fi

0 commit comments

Comments
 (0)