Merge pull request #11 from js-ish/keep-pub

keep pub
js-ish · Jul 8, 2023 · fa20aa8 · fa20aa8
2 parents 85e4cf6 + 9fa8e59
commit fa20aa8
Show file tree

Hide file tree

Showing 21 changed files with 10 additions and 303 deletions.
diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml
@@ -9,7 +9,7 @@ env:
   IMAGE_NAME: ${{ secrets.REGISTRY }}/ish/helm
 
 jobs:
-  pythoncontainer:
+  helm:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/kubectl.yml b/.github/workflows/kubectl.yml
@@ -9,7 +9,7 @@ env:
   IMAGE_NAME: ${{ secrets.REGISTRY }}/ish/kubectl
 
 jobs:
-  pythoncontainer:
+  kubectl:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/nodeapp.yml b/.github/workflows/nodeapp.yml
@@ -9,7 +9,7 @@ env:
   IMAGE_NAME: ${{ secrets.REGISTRY }}/ish/nodeapp
 
 jobs:
-  basecontainer:
+  nodeapp-base:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -28,21 +28,3 @@ jobs:
           file: ./nodeapp/base.Dockerfile
           push: true
           tags: ${{ env.IMAGE_NAME }}:base
-  devcontainer:
-    runs-on: ubuntu-latest
-    needs: basecontainer
-    steps:
-      - uses: actions/checkout@v2
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ secrets.REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: ./nodeapp
-          file: ./nodeapp/dev.Dockerfile
-          push: true
-          tags: ${{ env.IMAGE_NAME }}:dev
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -9,7 +9,7 @@ env:
   IMAGE_NAME: ${{ secrets.REGISTRY }}/ish/package
 
 jobs:
-  pythoncontainer:
+  package-py:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml
@@ -9,7 +9,7 @@ env:
   IMAGE_NAME: ${{ secrets.REGISTRY }}/ish/pythonapp
 
 jobs:
-  basecontainer:
+  pythonapp-base:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -28,39 +28,3 @@ jobs:
           file: ./pythonapp/base.Dockerfile
           push: true
           tags: ${{ env.IMAGE_NAME }}:base
-  devcontainer:
-    runs-on: ubuntu-latest
-    needs: basecontainer
-    steps:
-      - uses: actions/checkout@v2
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ secrets.REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: ./pythonapp
-          file: ./pythonapp/dev.Dockerfile
-          push: true
-          tags: ${{ env.IMAGE_NAME }}:dev
-  deploycontainer:
-    runs-on: ubuntu-latest
-    needs: basecontainer
-    steps:
-      - uses: actions/checkout@v2
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ secrets.REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: ./pythonapp
-          file: ./pythonapp/deploy.Dockerfile
-          push: true
-          tags: ${{ env.IMAGE_NAME }}:deploy
diff --git a/.github/workflows/pytorch.yml b/.github/workflows/pytorch.yml
@@ -9,7 +9,7 @@ env:
   IMAGE_NAME: ${{ secrets.REGISTRY }}/ish/pytorch
 
 jobs:
-  basecontainer:
+  pytorch-base:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -28,39 +28,3 @@ jobs:
           file: ./pytorch/base.Dockerfile
           push: true
           tags: ${{ env.IMAGE_NAME }}:base
-  devcontainer:
-    runs-on: ubuntu-latest
-    needs: basecontainer
-    steps:
-      - uses: actions/checkout@v2
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ secrets.REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build Dev Container
-        uses: docker/build-push-action@v3
-        with:
-          context: ./pytorch
-          file: ./pytorch/dev.Dockerfile
-          push: true
-          tags: ${{ env.IMAGE_NAME }}:dev
-  traincontainer:
-    runs-on: ubuntu-latest
-    needs: basecontainer
-    steps:
-      - uses: actions/checkout@v2
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ secrets.REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build and push train Container
-        uses: docker/build-push-action@v3
-        with:
-          context: ./pytorch
-          file: ./pytorch/train.Dockerfile
-          push: true
-          tags: ${{ env.IMAGE_NAME }}:train
diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml
@@ -9,7 +9,7 @@ env:
   IMAGE_NAME: ${{ secrets.REGISTRY }}/ish/r
 
 jobs:
-  basecontainer:
+  r-base:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -28,21 +28,3 @@ jobs:
           file: ./r/base.Dockerfile
           push: true
           tags: ${{ env.IMAGE_NAME }}:base
-  devcontainer:
-    runs-on: ubuntu-latest
-    needs: basecontainer
-    steps:
-      - uses: actions/checkout@v2
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ secrets.REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: ./r
-          file: ./r/dev.Dockerfile
-          push: true
-          tags: ${{ env.IMAGE_NAME }}:dev
diff --git a/helm.Dockerfile b/helm.Dockerfile
@@ -6,7 +6,6 @@ ENV BASE_URL="https://get.helm.sh"
 ENV TAR_FILE="helm-v${HELM_VERSION}-linux-amd64.tar.gz"
 
 RUN set -eux; \
-    sed -i "[email protected]/@repo.huaweicloud.com/@g" /etc/apk/repositories; \
     apk add --update --no-cache git; \
     apk add --update --no-cache -t deps curl; \
     curl -sL ${BASE_URL}/${TAR_FILE} | tar -xvz; \

diff --git a/kubectl/Dockerfile b/kubectl/Dockerfile
@@ -1,7 +1,6 @@
 FROM atlassian/pipelines-kubectl:1.24.2
 
 RUN set -eux; \
-    sed -i "[email protected]/@repo.huaweicloud.com/@g" /etc/apk/repositories; \
     apk add --update --no-cache openssl yq curl;
 
 

diff --git a/nodeapp/base.Dockerfile b/nodeapp/base.Dockerfile
@@ -1,6 +1,4 @@
 FROM node:18-bullseye
 
 RUN set -eux; \
-    sed -i "s@http://deb.debian.org@https://repo.huaweicloud.com@g" /etc/apt/sources.list; \
-    sed -i "s@http://security.debian.org@https://repo.huaweicloud.com@g" /etc/apt/sources.list; \
     corepack enable
diff --git a/nodeapp/dev.Dockerfile b/nodeapp/dev.Dockerfile
diff --git a/package/python.Dockerfile b/package/python.Dockerfile
@@ -2,6 +2,4 @@ FROM python:3.10-bullseye
 
 
 RUN set -eux; \
-    sed -i "s@http://deb.debian.org@https://repo.huaweicloud.com@g" /etc/apt/sources.list; \
-    sed -i "s@http://security.debian.org@https://repo.huaweicloud.com@g" /etc/apt/sources.list; \
-    pip --disable-pip-version-check --no-cache-dir install twine -i https://mirrors.aliyun.com/pypi/simple/;
+    pip --disable-pip-version-check --no-cache-dir install twine
diff --git a/pythonapp/base.Dockerfile b/pythonapp/base.Dockerfile
@@ -1,13 +1,11 @@
 FROM python:3.10-bullseye
 
 RUN set -eux; \
-    sed -i "s@http://deb.debian.org@https://repo.huaweicloud.com@g" /etc/apt/sources.list; \
-    sed -i "s@http://security.debian.org@https://repo.huaweicloud.com@g" /etc/apt/sources.list; \
     apt-get update; \
     apt-get install -y --no-install-recommends \
         libmariadb-dev \
     ; \
     rm -rf /var/lib/apt/lists/*; \
-    pip --disable-pip-version-check --no-cache-dir install -i https://repo.huaweicloud.com/repository/pypi/simple \
+    pip --disable-pip-version-check --no-cache-dir install \
         mysqlclient \
     ;
diff --git a/pythonapp/deploy.Dockerfile b/pythonapp/deploy.Dockerfile
diff --git a/pythonapp/dev.Dockerfile b/pythonapp/dev.Dockerfile
diff --git a/pytorch/base.Dockerfile b/pytorch/base.Dockerfile
@@ -1,8 +1,6 @@
 FROM nvidia/cuda:11.6.2-devel-ubuntu20.04
 
 RUN set -eux; \
-    sed -i "s@//.*archive.ubuntu.com@//repo.huaweicloud.com@g" /etc/apt/sources.list; \
-    sed -i "s@//.*security.ubuntu.com@//repo.huaweicloud.com@g" /etc/apt/sources.list; \
     apt-get update; \
     apt-get install -y --no-install-recommends \
         python3-dev \
@@ -15,4 +13,4 @@ RUN pip install --disable-pip-version-check --no-cache-dir \
        torch==1.13.1+cu116 torchvision==0.14.1+cu116 torchaudio==0.13.1 torchtext==0.14.1 \
        --extra-index-url https://download.pytorch.org/whl/cu116; \
     pip install --disable-pip-version-check --no-cache-dir \
-       Pillow scikit-learn
+       Pillow scikit-learn pyyaml
diff --git a/pytorch/dev.Dockerfile b/pytorch/dev.Dockerfile
diff --git a/pytorch/envlist b/pytorch/envlist