This is an automated email from the ASF dual-hosted git repository. wangdan pushed a commit to branch fix-github-ubuntu-2004-runner-removed in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
commit 6aa98628038341999a74c4a9fefa1947862491db Author: Dan Wang <[email protected]> AuthorDate: Thu Apr 24 19:02:12 2025 +0800 ci(github): fix that Go workflows failed due to Ubuntu 20.04 retirement --- .github/workflows/build-push-env-docker.yml | 11 +++++++++++ docker/pegasus-build-env/ubuntu2204/Dockerfile | 7 ++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-push-env-docker.yml b/.github/workflows/build-push-env-docker.yml index 8a26637af..4c09badb8 100644 --- a/.github/workflows/build-push-env-docker.yml +++ b/.github/workflows/build-push-env-docker.yml @@ -71,5 +71,16 @@ jobs: push: true tags: | apache/pegasus:build-env-${{ matrix.dockertag }}-${{ github.ref_name }} + - name: Build and push for Go + uses: docker/build-push-action@v6 + with: + platforms: linux/amd64 + context: . + file: ./docker/pegasus-build-env/ubuntu2204/Dockerfile + push: true + tags: | + apache/pegasus:build-env-ubuntu2204-${{ github.ref_name }}-go + build-args: | + THRIFT_VERSION=0.13.0 - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/docker/pegasus-build-env/ubuntu2204/Dockerfile b/docker/pegasus-build-env/ubuntu2204/Dockerfile index e5a08417d..d439b98ed 100644 --- a/docker/pegasus-build-env/ubuntu2204/Dockerfile +++ b/docker/pegasus-build-env/ubuntu2204/Dockerfile @@ -56,11 +56,12 @@ RUN apt-get update -y; \ RUN pip3 install --no-cache-dir --upgrade pip RUN pip3 install --no-cache-dir cmake -RUN wget --progress=dot:giga https://archive.apache.org/dist/thrift/0.11.0/thrift-0.11.0.tar.gz -P /opt/thrift && \ - cd /opt/thrift && tar xzf thrift-0.11.0.tar.gz && cd thrift-0.11.0 && ./bootstrap.sh && \ +ARG THRIFT_VERSION=0.11.0 +RUN wget --progress=dot:giga https://archive.apache.org/dist/thrift/${THRIFT_VERSION}/thrift-${THRIFT_VERSION}.tar.gz -P /opt/thrift && \ + cd /opt/thrift && tar xzf thrift-${THRIFT_VERSION}.tar.gz && cd thrift-${THRIFT_VERSION} && ./bootstrap.sh && \ ./configure --enable-libs=no && \ make -j$(($(nproc)/2+1)) && make install && cd - && \ - rm -rf thrift-0.11.0 thrift-0.11.0.tar.gz + rm -rf thrift-${THRIFT_VERSION} thrift-${THRIFT_VERSION}.tar.gz ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 ENV CLASSPATH=$JAVA_HOME/lib/ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
