This is an automated email from the ASF dual-hosted git repository.
laiyingchun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/master by this push:
new 1281c584 chore: Use official apache/pegasus repo on DockerHub (#949)
1281c584 is described below
commit 1281c58422adce2105c08400d3c74e41afe76a0a
Author: Yingchun Lai <[email protected]>
AuthorDate: Sun Apr 24 11:09:15 2022 +0800
chore: Use official apache/pegasus repo on DockerHub (#949)
---
.github/workflows/build-push-env-docker.yml | 27 ++++------
.github/workflows/ci-pull-request.yaml | 10 ++--
.github/workflows/pegasus-regular-build.yml | 23 +++------
.github/workflows/thirdparty-regular-push.yml | 60 +++++++++-------------
docker/README.md | 26 +++++-----
docker/ci-env/Dockerfile | 2 +-
.../image_for_prebuilt_bin/Dockerfile | 2 +-
docker/thirdparties-bin/Dockerfile | 4 +-
docker/thirdparties-src/Dockerfile | 4 +-
rdsn | 2 +-
10 files changed, 66 insertions(+), 94 deletions(-)
diff --git a/.github/workflows/build-push-env-docker.yml
b/.github/workflows/build-push-env-docker.yml
index 4711fcda..e03c111a 100644
--- a/.github/workflows/build-push-env-docker.yml
+++ b/.github/workflows/build-push-env-docker.yml
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
---
-name: BuildCompilationEnvDocker-build and publish multi compilation os env
+name: BuildCompilationEnvDocker - build and publish multi compilation OS env
on:
push:
@@ -36,33 +36,26 @@ jobs:
- ubuntu1604
- ubuntu1804
- ubuntu2004
- #- centos6 is EOL
- centos7
steps:
- -
- name: Checkout
+ - name: Checkout
uses: actions/checkout@v2
- -
- name: Set up QEMU
+ - name: Set up QEMU
uses: docker/setup-qemu-action@v1
- -
- name: Set up Docker Buildx
+ - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- -
- name: Login to DockerHub
+ - name: Login to DockerHub
uses: docker/login-action@v1
with:
- username: ${{ secrets.DOCKERHUB_USERNAME }}
+ username: ${{ secrets.DOCKERHUB_USER }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- -
- name: Build and push
- uses: docker/build-push-action@v2
+ - name: Build and push
+ uses: docker/[email protected]
with:
context: .
file: ./docker/pegasus-build-env/${{ matrix.dockertag }}/Dockerfile
push: true
tags: |
- apachepegasus/build-env:${{ matrix.dockertag }}
- -
- name: Image digest
+ apache/pegasus:build-env-${{ matrix.dockertag }}
+ - name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/ci-pull-request.yaml
b/.github/workflows/ci-pull-request.yaml
index 26944141..238a8e3a 100644
--- a/.github/workflows/ci-pull-request.yaml
+++ b/.github/workflows/ci-pull-request.yaml
@@ -49,7 +49,7 @@ jobs:
name: Lint
runs-on: ubuntu-latest
container:
- image: apachepegasus/clang-format-3.9
+ image: apache/pegasus:clang-format-3.9
steps:
- uses: actions/checkout@v2
with:
@@ -63,7 +63,7 @@ jobs:
needs: lint
runs-on: ubuntu-latest
container:
- image: apachepegasus/thirdparties-bin:ubuntu1804
+ image: apache/pegasus:thirdparties-bin-ubuntu1804
defaults:
run:
shell: bash
@@ -75,11 +75,9 @@ jobs:
run: unzip /root/thirdparties-bin.zip -d ./rdsn/thirdparty
- name: Compilation
run: ./run.sh build -c --skip_thirdparty
- -
- name: Packaging Server
+ - name: Packaging Server
run: ./run.sh pack_server
- -
- name: Packaging Tools
+ - name: Packaging Tools
run: ./run.sh pack_tools
- name: Unit Testing
run: |
diff --git a/.github/workflows/pegasus-regular-build.yml
b/.github/workflows/pegasus-regular-build.yml
index 23d58855..2a83850f 100644
--- a/.github/workflows/pegasus-regular-build.yml
+++ b/.github/workflows/pegasus-regular-build.yml
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
---
-name: BuildPegasusRegularly-build pegasus and rdsn on different env every day
+name: BuildPegasusRegularly - build pegasus and rdsn on different env every day
on:
push:
@@ -39,7 +39,6 @@ jobs:
- ubuntu1604
- ubuntu1804
- ubuntu2004
- #- centos6 is EOL
- centos7
compiler-family:
- gcc
@@ -51,7 +50,7 @@ jobs:
compiler: "clang-9,clang++-9"
os: ubuntu1804
container:
- image: apachepegasus/thirdparties-bin:${{ matrix.os }}
+ image: apache/pegasus:thirdparties-bin-${{ matrix.os }}
defaults:
run:
working-directory: /root/incubator-pegasus
@@ -61,33 +60,27 @@ jobs:
run: |
git clone --recursive --depth=1
https://github.com/apache/incubator-pegasus.git
cd incubator-pegasus
- -
- name: Unpack prebuilt third-parties
+ - name: Unpack prebuilt third-parties
run: unzip /root/thirdparties-bin.zip -d ./rdsn/thirdparty
- -
- name: Compilation rdsn on GCC
+ - name: Compilation rdsn on GCC
if: ${{ matrix.compiler-family == 'gcc' }}
run: |
cd ./rdsn
./run.sh build -c --skip_thirdparty
- -
- name: Compilation pegasus on GCC
+ - name: Compilation pegasus on GCC
if: ${{ matrix.compiler-family == 'gcc' }}
run: ./run.sh build -c --skip_thirdparty
- -
- name: Compilation rdsn on Clang
+ - name: Compilation rdsn on Clang
if: ${{ matrix.compiler-family == 'clang' }}
env:
COMPILER: ${{ matrix.compiler }}
run: |
cd ./rdsn
./run.sh build --compiler $COMPILER --skip_thirdparty
- -
- name: Compilation pegasus on Clang
+ - name: Compilation pegasus on Clang
if: ${{ matrix.compiler-family == 'clang' }}
env:
COMPILER: ${{ matrix.compiler }}
run: ./run.sh build --compiler $COMPILER --skip_thirdparty
- -
- name: Packaging Server
+ - name: Packaging Server
run: ./run.sh pack_server
diff --git a/.github/workflows/thirdparty-regular-push.yml
b/.github/workflows/thirdparty-regular-push.yml
index 96c716af..8071e40e 100644
--- a/.github/workflows/thirdparty-regular-push.yml
+++ b/.github/workflows/thirdparty-regular-push.yml
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
---
-name: BuildThirdpartyDockerRegularly-build and publish thirdparty every week
+name: BuildThirdpartyDockerRegularly - build and publish thirdparty every week
on:
push:
@@ -26,7 +26,7 @@ on:
# for manually triggering workflow
workflow_dispatch:
-
+
# run for every week 2am UTC+8(Beijing)
schedule:
- cron: '0 18 * * 1'
@@ -35,35 +35,29 @@ jobs:
build_push_src_docker_images:
runs-on: ubuntu-latest
steps:
- -
- uses: actions/checkout@v2
- -
- name: Set up QEMU
+ - uses: actions/checkout@v2
+ - name: Set up QEMU
uses: docker/setup-qemu-action@v1
- -
- name: Set up Docker Buildx
+ - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- -
- name: Login to DockerHub
- uses: docker/login-action@v1
+ - name: Login to DockerHub
+ uses: docker/login-action@v1
with:
- username: ${{ secrets.DOCKERHUB_USERNAME }}
+ username: ${{ secrets.DOCKERHUB_USER }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- -
- name: Build and push
- uses: docker/build-push-action@v2
+ - name: Build and push
+ uses: docker/[email protected]
with:
context: .
file: ./docker/thirdparties-src/Dockerfile
push: true
tags: |
- apachepegasus/thirdparties-src
+ apache/pegasus:thirdparties-src
build-args: |
- REGISTRY_REPO=apachepegasus
- -
- name: Image digest
+ REGISTRY_REPO=apache/pegasus
+ - name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
-
+
build_push_bin_docker_images:
runs-on: ubuntu-latest
strategy:
@@ -76,31 +70,25 @@ jobs:
#- centos6 is EOL
- centos7
steps:
- -
- uses: actions/checkout@v2
- -
- name: Set up QEMU
+ - uses: actions/checkout@v2
+ - name: Set up QEMU
uses: docker/setup-qemu-action@v1
- -
- name: Set up Docker Buildx
+ - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- -
- name: Login to DockerHub
- uses: docker/login-action@v1
+ - name: Login to DockerHub
+ uses: docker/login-action@v1
with:
- username: ${{ secrets.DOCKERHUB_USERNAME }}
+ username: ${{ secrets.DOCKERHUB_USER }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- -
- name: Build and push
- uses: docker/build-push-action@v2
+ - name: Build and push
+ uses: docker/[email protected]
with:
context: .
file: ./docker/thirdparties-bin/Dockerfile
push: true
tags: |
- apachepegasus/thirdparties-bin:${{ matrix.osversion }}
+ apache/pegasus:thirdparties-bin-${{ matrix.osversion }}
build-args: |
OS_VERSION=${{ matrix.osversion }}
- -
- name: Image digest
+ - name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/docker/README.md b/docker/README.md
index e9f5f526..2faecbc6 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -23,11 +23,11 @@ to deploying a standalone cluster of Pegasus containers on
your local machine.
## Workflows
-
+[](https://github.com/apache/incubator-pegasus/actions/workflows/build-push-env-docker.yml)
-
+[](https://github.com/apache/incubator-pegasus/actions/workflows/thirdparty-regular-push.yml)
-
+[](https://github.com/apache/incubator-pegasus/actions/workflows/pegasus-regular-build.yml)
## pegasus-build-env
@@ -35,12 +35,12 @@ Building environment for Pegasus compilation.
Github Actions automatically rebuilds and publishes build-env for every commit.
-- `apachepegasus/build-env:centos7`
-- `apachepegasus/build-env:ubuntu1604`
-- `apachepegasus/build-env:ubuntu1804`
-- `apachepegasus/build-env:ubuntu2004`
+- `apache/pegasus:build-env-centos7`
+- `apache/pegasus:build-env-ubuntu1604`
+- `apache/pegasus:build-env-ubuntu1804`
+- `apache/pegasus:build-env-ubuntu2004`
-DockerHub: https://hub.docker.com/r/apachepegasus/build-env
+DockerHub: https://hub.docker.com/r/apache/pegasus
The How-to-use Manual is at:
http://pegasus.apache.org/docs/build/compile-by-docker/
@@ -51,14 +51,14 @@ It packages the downloaded sources into a zip in the
container, so that
other repos can easily extract third-parties from the container (via `docker
cp`),
without downloading from the cloud object storage.
-- `apachepegasus/thirdparties-src`
+- `apache/pegasus:thirdparties-src`
## thirdparties-bin
This is a Docker image for Pegasus unit-testing. It prebuilts the thirdparty
libraries,
so jobs based on this image can skip building third-parties.
-- `apachepegasus/thirdparties-bin:centos7`
-- `apachepegasus/thirdparties-bin:ubuntu1604`
-- `apachepegasus/thirdparties-bin:ubuntu1804`
-- `apachepegasus/thirdparties-bin:ubuntu2004`
+- `apache/pegasus:thirdparties-bin-centos7`
+- `apache/pegasus:thirdparties-bin-ubuntu1604`
+- `apache/pegasus:thirdparties-bin-ubuntu1804`
+- `apache/pegasus:thirdparties-bin-ubuntu2004`
diff --git a/docker/ci-env/Dockerfile b/docker/ci-env/Dockerfile
index c7d49d1f..43a5444e 100644
--- a/docker/ci-env/Dockerfile
+++ b/docker/ci-env/Dockerfile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-FROM apachepegasus/build-env:centos7
+FROM apache/pegasus:build-env-centos7
WORKDIR /root
diff --git a/docker/pegasus-docker-compose/image_for_prebuilt_bin/Dockerfile
b/docker/pegasus-docker-compose/image_for_prebuilt_bin/Dockerfile
index 07fe9952..1e3369a1 100644
--- a/docker/pegasus-docker-compose/image_for_prebuilt_bin/Dockerfile
+++ b/docker/pegasus-docker-compose/image_for_prebuilt_bin/Dockerfile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-FROM apachepegasus/build-env:ubuntu2004
+FROM apache/pegasus:build-env-ubuntu2004
ARG SERVER_PKG_NAME
diff --git a/docker/thirdparties-bin/Dockerfile
b/docker/thirdparties-bin/Dockerfile
index bcd3866f..0a98eb90 100644
--- a/docker/thirdparties-bin/Dockerfile
+++ b/docker/thirdparties-bin/Dockerfile
@@ -17,11 +17,11 @@
ARG OS_VERSION=centos7
-FROM apachepegasus/thirdparties-src as builder
+FROM apache/pegasus:thirdparties-src as builder
ARG OS_VERSION=centos7
-FROM apachepegasus/build-env:${OS_VERSION}
+FROM apache/pegasus:build-env-${OS_VERSION}
WORKDIR /root
diff --git a/docker/thirdparties-src/Dockerfile
b/docker/thirdparties-src/Dockerfile
index 16de8cf3..3446cc26 100644
--- a/docker/thirdparties-src/Dockerfile
+++ b/docker/thirdparties-src/Dockerfile
@@ -16,9 +16,9 @@
# under the License.
# use dockerhub by default
-ARG REGISTRY_REPO=apachepegasus
+ARG REGISTRY_REPO=apache/pegasus
-FROM ${REGISTRY_REPO}/build-env:centos7 as builder
+FROM ${REGISTRY_REPO}:build-env-centos7 as builder
WORKDIR /root
diff --git a/rdsn b/rdsn
index 6cf41ac5..da843900 160000
--- a/rdsn
+++ b/rdsn
@@ -1 +1 @@
-Subproject commit 6cf41ac5c7d293676fb6cc3657c217c6dc524c09
+Subproject commit da843900f4d89e658038048775d9adf9604bd5ec
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
