[ci skip] use always centos:centos7

skaji · Apr 27, 2024 · 1df5347 · 1df5347
1 parent 80a2544
commit 1df5347
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: docker build --build-arg IMAGE=centos:centos6 -t skaji/relocatable-perl -f build/Dockerfile .
+      - run: docker build -t skaji/relocatable-perl -f build/Dockerfile .
       - run: bash build/github-actions.sh linux_amd64_create_artifacts
       - uses: actions/upload-artifact@v4
         with:
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
-      - run: docker buildx build --platform linux/arm64 --build-arg IMAGE=centos:centos7 -t skaji/relocatable-perl -f build/Dockerfile --load .
+      - run: docker buildx build --platform linux/arm64 -t skaji/relocatable-perl -f build/Dockerfile --load .
       - run: bash build/github-actions.sh linux_arm64_create_artifacts
       - uses: actions/upload-artifact@v4
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: docker build --build-arg IMAGE=centos:centos6 -t skaji/relocatable-perl -f build/Dockerfile .
+      - run: docker build -t skaji/relocatable-perl -f build/Dockerfile .
       - run: bash build/github-actions.sh linux_amd64_create_artifacts
       - uses: actions/upload-artifact@v4
         with:
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
-      - run: docker buildx build --platform linux/arm64 --build-arg IMAGE=centos:centos7 -t skaji/relocatable-perl -f build/Dockerfile --load .
+      - run: docker buildx build --platform linux/arm64 -t skaji/relocatable-perl -f build/Dockerfile --load .
       - run: bash build/github-actions.sh linux_arm64_create_artifacts
       - uses: actions/upload-artifact@v4
         with:

diff --git a/build/Dockerfile b/build/Dockerfile
@@ -1,8 +1,5 @@
-ARG IMAGE
-FROM $IMAGE
-ARG IMAGE
+FROM centos:centos7
 
-RUN if [[ $IMAGE = centos:centos6 ]]; then sed -i 's/^#baseurl=/baseurl=/g; s/^mirrorlist=/#mirrorlist=/g; s/http:\/\/mirror.centos.org/https:\/\/vault.centos.org/g' /etc/yum.repos.d/CentOS-Base.repo; fi
 RUN yum install -y \
     gcc \
     make \