From d81ace00ba6ee2e8fda1e81b30abd67ad198121b Mon Sep 17 00:00:00 2001 From: "anzhe.su" Date: Sat, 31 Aug 2024 23:41:15 +0800 Subject: [PATCH 1/4] [Feature][pull]: add config yml for syncing from dockerhub to ali mirror --- .github/workflows/docker_pull_ali.yml | 59 +++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 .github/workflows/docker_pull_ali.yml diff --git a/.github/workflows/docker_pull_ali.yml b/.github/workflows/docker_pull_ali.yml new file mode 100644 index 0000000..7e96132 --- /dev/null +++ b/.github/workflows/docker_pull_ali.yml @@ -0,0 +1,59 @@ +name: Docker Image Pull + +on: + push: + branches: [ "main" ] + paths: [ + ".github/workflows/docker_pull_ali.yml", + ] + pull_request: + branches: [ "main" ] + types: [opened, synchronize, closed] + paths: [ + ".github/workflows/docker_pull_ali.yml", + ] + +env: + VERSION: 3.1.0 + +jobs: + build: + runs-on: ubuntu-latest + if: ${{ github.event_name == 'pull_request' && github.event.action != 'closed' }} + steps: + - uses: actions/checkout@v3 + - name: Log in to Docker Hub + uses: docker/login-action@v2.1.0 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + - name: Delete huge unnecessary tools folder + run: rm -rf /opt/hostedtoolcache + - name: Pull Docker images xiaoyaliu/alist:latest for 20240820 + run: docker pull xiaoyaliu/alist:latest + - name: Log in to Ali mirror + run: echo "${{ secrets.ALIMIRROR_PASSWORD }}" | docker login registry.cn-hangzhou.aliyuncs.com --username=${{ secrets.ALIMIRROR_USERNAME }} --password-stdin + - name: Tag Docker images xiaoyaliu/alist:latest for 20240820 + run: docker tag xiaoyaliu/alist:lastet registry.cn-hangzhou.aliyuncs.com/saz0568/alist:latest + - name: Push Docker images xiaoyaliu/alist:latest for 20240820 + run: docker push registry.cn-hangzhou.aliyuncs.com/saz0568/alist:latest + publish: + runs-on: ubuntu-latest + if: ${{ github.event.pull_request.merged == true }} + steps: + - uses: actions/checkout@v3 + - name: Log in to Docker Hub + uses: docker/login-action@v2.1.0 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + - name: Delete huge unnecessary tools folder + run: rm -rf /opt/hostedtoolcache +# - name: Pull Docker image from DockerHub +# run: docker pull saz0568/zelos-image:redis-stack-7.4.0-v0 +# - name: Log in to zelos Harbor +# run: echo "${{ secrets.HARBOR_PASSWORD }}" | docker login harbor.zelostech.com.cn:5443 --username=${{ secrets.HARBOR_USERNAME }} --password-stdin +# - name: Tag Harbor images +# run: docker tag saz0568/zelos-image:redis-stack-7.4.0-v0 harbor.zelostech.com.cn:5443/devops/redis/redis-stack:7.4.0-v0 +# - name: Push Harbor images +# run: docker push harbor.zelostech.com.cn:5443/devops/redis/redis-stack:7.4.0-v0 From 280dd08e7695893aa033f519d18b9e85fb56aedc Mon Sep 17 00:00:00 2001 From: "anzhe.su" Date: Sat, 31 Aug 2024 23:44:54 +0800 Subject: [PATCH 2/4] [Feature][pull]: add config yml for syncing from dockerhub to ali mirror --- .github/workflows/docker_pull_ali.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker_pull_ali.yml b/.github/workflows/docker_pull_ali.yml index 7e96132..9ee33c8 100644 --- a/.github/workflows/docker_pull_ali.yml +++ b/.github/workflows/docker_pull_ali.yml @@ -34,7 +34,7 @@ jobs: - name: Log in to Ali mirror run: echo "${{ secrets.ALIMIRROR_PASSWORD }}" | docker login registry.cn-hangzhou.aliyuncs.com --username=${{ secrets.ALIMIRROR_USERNAME }} --password-stdin - name: Tag Docker images xiaoyaliu/alist:latest for 20240820 - run: docker tag xiaoyaliu/alist:lastet registry.cn-hangzhou.aliyuncs.com/saz0568/alist:latest + run: docker tag xiaoyaliu/alist:latest registry.cn-hangzhou.aliyuncs.com/saz0568/alist:latest - name: Push Docker images xiaoyaliu/alist:latest for 20240820 run: docker push registry.cn-hangzhou.aliyuncs.com/saz0568/alist:latest publish: From 48b2cfc7bacd9018ee8e5b78ac950837d73c80e6 Mon Sep 17 00:00:00 2001 From: "anzhe.su" Date: Sun, 1 Sep 2024 00:06:53 +0800 Subject: [PATCH 3/4] [Hotfix][pull]: pull diff platform image support --- .github/workflows/docker_pull_ali.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker_pull_ali.yml b/.github/workflows/docker_pull_ali.yml index 9ee33c8..bc52d08 100644 --- a/.github/workflows/docker_pull_ali.yml +++ b/.github/workflows/docker_pull_ali.yml @@ -30,13 +30,19 @@ jobs: - name: Delete huge unnecessary tools folder run: rm -rf /opt/hostedtoolcache - name: Pull Docker images xiaoyaliu/alist:latest for 20240820 - run: docker pull xiaoyaliu/alist:latest + run: docker pull xiaoyaliu/alist:latest --platform linux/amd64 + - name: Tag Docker images xiaoyaliu/alist:latest for 20240820 + run: docker tag xiaoyaliu/alist:latest registry.cn-hangzhou.aliyuncs.com/saz0568/alist:latest-amd64 + - name: Pull Docker images xiaoyaliu/alist:latest for 20240820 + run: docker pull xiaoyaliu/alist:latest --platform linux/arm/v7 + - name: Tag Docker images xiaoyaliu/alist:latest for 20240820 + run: docker tag xiaoyaliu/alist:latest registry.cn-hangzhou.aliyuncs.com/saz0568/alist:latest-armv7 - name: Log in to Ali mirror run: echo "${{ secrets.ALIMIRROR_PASSWORD }}" | docker login registry.cn-hangzhou.aliyuncs.com --username=${{ secrets.ALIMIRROR_USERNAME }} --password-stdin - - name: Tag Docker images xiaoyaliu/alist:latest for 20240820 - run: docker tag xiaoyaliu/alist:latest registry.cn-hangzhou.aliyuncs.com/saz0568/alist:latest - name: Push Docker images xiaoyaliu/alist:latest for 20240820 - run: docker push registry.cn-hangzhou.aliyuncs.com/saz0568/alist:latest + run: docker push registry.cn-hangzhou.aliyuncs.com/saz0568/alist:latest-amd64 + - name: Push Docker images xiaoyaliu/alist:latest for 20240820 + run: docker push registry.cn-hangzhou.aliyuncs.com/saz0568/alist:latest-armv7 publish: runs-on: ubuntu-latest if: ${{ github.event.pull_request.merged == true }} From cc2c5924083f6ad5e424f14a57b413a592cfe7d8 Mon Sep 17 00:00:00 2001 From: "anzhe.su" Date: Fri, 6 Sep 2024 14:47:37 +0800 Subject: [PATCH 4/4] [Hotfix][base]: change base os from ubuntu20.04 to ubuntu22.04 --- .github/workflows/docker_build_base_cuda.yml | 2 +- base/cuda/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker_build_base_cuda.yml b/.github/workflows/docker_build_base_cuda.yml index 965ca4b..1684867 100644 --- a/.github/workflows/docker_build_base_cuda.yml +++ b/.github/workflows/docker_build_base_cuda.yml @@ -17,7 +17,7 @@ on: env: IMAGE_NAME: jupyter - VERSION: base-cu11.8 + VERSION: base-cu11.8-ubuntu22.04 DOCKERFILE: Dockerfile jobs: diff --git a/base/cuda/Dockerfile b/base/cuda/Dockerfile index 27fb361..57aeed9 100644 --- a/base/cuda/Dockerfile +++ b/base/cuda/Dockerfile @@ -3,7 +3,7 @@ # # ARG BASE_IMG=nvcr.io/nvidia/cuda:11.4.3-cudnn8-devel-ubuntu20.04 -ARG BASE_IMG=nvcr.io/nvidia/cuda:11.8.0-cudnn8-devel-ubuntu20.04 +ARG BASE_IMG=nvcr.io/nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04 FROM $BASE_IMG ARG TARGETARCH=amd64