From 9c4c348c2c4dd992bef1ae1f42f9df55457b0d49 Mon Sep 17 00:00:00 2001 From: George <58841610+Shinji-IkariG@users.noreply.github.com> Date: Fri, 30 Aug 2024 15:14:29 +0800 Subject: [PATCH] Change Centos7 yum config (#148) * Update centos-7.Dockerfile * Update centos-7.Dockerfile * Update centos-7.Dockerfile * Update centos-7.Dockerfile * Update centos-7.Dockerfile * Update centos-7.Dockerfile * Update centos-7.Dockerfile * Update centos-7.Dockerfile * Update centos-8.Dockerfile * Update centos-7.Dockerfile * Update centos-8.Dockerfile * Simplified editing method * update actions version --- .github/workflows/build.yml | 4 ++-- .github/workflows/docker.yml | 10 +++++----- docker/buildx/centos-7.Dockerfile | 6 ++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4604a38..5a6aeb5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,10 +58,10 @@ jobs: container: image: vesoft/third-party-build:${{ matrix.os }} steps: - - uses: webiny/action-post-run@3.0.0 + - uses: webiny/action-post-run@3.1.0 with: run: find . -mindepth 1 -delete - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up environment if: matrix.compiler != '' run: | diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 56e2422..d2fdf74 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -32,14 +32,14 @@ jobs: id: vars run: | echo "TAG=$(echo ${{ matrix.os }} | tr -d '-')" >> $GITHUB_OUTPUT - - uses: actions/checkout@v3 - - uses: docker/login-action@v2 + - uses: actions/checkout@v4 + - uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 - - uses: docker/build-push-action@v4 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 + - uses: docker/build-push-action@v6 with: context: . file: ./docker/buildx/${{ matrix.os }}.Dockerfile diff --git a/docker/buildx/centos-7.Dockerfile b/docker/buildx/centos-7.Dockerfile index 9fef756..46756f6 100644 --- a/docker/buildx/centos-7.Dockerfile +++ b/docker/buildx/centos-7.Dockerfile @@ -1,8 +1,10 @@ FROM centos:7 SHELL ["/bin/bash", "-c"] ARG GOLANG_VERSION=1.21.6 -RUN yum install -y epel-release && yum update -y \ - && yum install -y make \ +RUN sed -i 's/^mirrorlist=/#mirrorlist=/g' /etc/yum.repos.d/CentOS-Base.repo && \ + sed -i "s|^#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g" /etc/yum.repos.d/CentOS-Base.repo && \ + yum install -y epel-release && yum update -y && \ + yum install -y make \ git \ m4 \ curl \