diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml index 289266e..aa179a2 100644 --- 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 index 49b214b..e8416a6 100644 --- 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 index 1d00d7f..69db047 100644 --- 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 index c32f703..6e63cb4 100644 --- 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 index 16eb943..5187021 100644 --- 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 index edf5e1e..57805bf 100644 --- 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 index 83dd613..ed52820 100644 --- 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 index ea5f934..0dd6d0d 100644 --- 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 "s@dl-cdn.alpinelinux.org/@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 index 8e1cd5c..a6c6224 100644 --- a/kubectl/Dockerfile +++ b/kubectl/Dockerfile @@ -1,7 +1,6 @@ FROM atlassian/pipelines-kubectl:1.24.2 RUN set -eux; \ - sed -i "s@dl-cdn.alpinelinux.org/@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 index e27385e..1b1d810 100644 --- 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 deleted file mode 100644 index 14b6232..0000000 --- a/nodeapp/dev.Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM swr.cn-east-3.myhuaweicloud.com/ish/nodeapp:base - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - openssh-server sudo \ - curl wget ca-certificates \ - vim git build-essential; \ - rm -rf /var/lib/apt/lists/*; \ - ssh-keygen -A; \ - sed -i -E "s/#?\s*UsePAM\s+.+/UsePAM yes/g" /etc/ssh/sshd_config; \ - sed -i -E "s/#?\s*PasswordAuthentication\s+.+/PasswordAuthentication yes/g" /etc/ssh/sshd_config; \ - mkdir /run/sshd; - -RUN set -eux; \ - useradd -s /bin/bash --uid 1001 -U -m dev; \ - echo "dev:dev" | chpasswd; \ - usermod -aG sudo dev; - -WORKDIR /home/dev diff --git a/package/python.Dockerfile b/package/python.Dockerfile index c1a7ae9..eeb4cfa 100644 --- 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 index 1149b95..bb9d97c 100644 --- 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 deleted file mode 100644 index 5b342ad..0000000 --- a/pythonapp/deploy.Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM python:3.10-alpine - -RUN set -eux; \ - sed -i "s@dl-cdn.alpinelinux.org@repo.huaweicloud.com@g" /etc/apk/repositories; \ - apk add --no-cache --virtual .build-deps mariadb-dev build-base; \ - pip --disable-pip-version-check --no-cache-dir install -i https://repo.huaweicloud.com/repository/pypi/simple \ - mysqlclient \ - ; \ - apk add --no-cache --virtual .runtime-deps mariadb-connector-c mariadb-connector-c-dev; \ - apk del .build-deps; \ - apk add --no-cache libc-dev gcc g++; - -RUN mkdir /usr/src/app - -ONBUILD COPY requirements.txt requirements.txt -ONBUILD COPY local_requirements.txt local_requirements.txt - -ONBUILD RUN set -eux; \ - pip --disable-pip-version-check --no-cache-dir install -i https://mirrors.aliyun.com/pypi/simple/ \ - -r requirements.txt; \ - pip --disable-pip-version-check --no-cache-dir install -i https://package-reader:glpat-GxMbTBVPTAuyQyfyy4yH@gitlab.ish.org.cn/api/v4/projects/51/packages/pypi/simple \ - -r local_requirements.txt; - -ONBUILD COPY . /usr/src/app/ - -WORKDIR /usr/src/app diff --git a/pythonapp/dev.Dockerfile b/pythonapp/dev.Dockerfile deleted file mode 100644 index 7772b1e..0000000 --- a/pythonapp/dev.Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM swr.cn-east-3.myhuaweicloud.com/ish/pythonapp:base - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - openssh-server sudo \ - curl wget ca-certificates \ - vim git build-essential; \ - rm -rf /var/lib/apt/lists/*; \ - ssh-keygen -A; \ - sed -i -E "s/#?\s*UsePAM\s+.+/UsePAM yes/g" /etc/ssh/sshd_config; \ - sed -i -E "s/#?\s*PasswordAuthentication\s+.+/PasswordAuthentication yes/g" /etc/ssh/sshd_config; \ - mkdir /run/sshd; - - -RUN set -eux; \ - useradd -s /bin/bash --uid 1001 -U -m dev; \ - echo "dev:dev" | chpasswd; \ - usermod -aG sudo dev; - -WORKDIR /home/dev diff --git a/pytorch/base.Dockerfile b/pytorch/base.Dockerfile index b378f31..69fc6e6 100644 --- 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 deleted file mode 100644 index 4a16dd6..0000000 --- a/pytorch/dev.Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM swr.cn-east-3.myhuaweicloud.com/ish/pytorch:base - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - openssh-server sudo \ - curl wget ca-certificates \ - vim git build-essential; \ - rm -rf /var/lib/apt/lists/*; \ - ssh-keygen -A; \ - sed -i -E "s/#?\s*UsePAM\s+.+/UsePAM yes/g" /etc/ssh/sshd_config; \ - sed -i -E "s/#?\s*PasswordAuthentication\s+.+/PasswordAuthentication yes/g" /etc/ssh/sshd_config; \ - mkdir /run/sshd; - - -COPY envlist /tmp/ - -RUN bash -c 'for line in $(cat /tmp/envlist); do printf "export %s=\"%s\"\n" "$line" "${!line}" | tee -a /etc/profile.d/02-envs.sh; done' - -RUN set -eux; \ - useradd -s /bin/bash --uid 1001 -U -m dev; \ - echo "dev:dev" | chpasswd; \ - usermod -aG sudo dev; - -WORKDIR /home/dev diff --git a/pytorch/envlist b/pytorch/envlist deleted file mode 100644 index b9a2862..0000000 --- a/pytorch/envlist +++ /dev/null @@ -1,35 +0,0 @@ -NV_LIBCUBLAS_VERSION -NVIDIA_VISIBLE_DEVICES -NV_NVML_DEV_VERSION -NV_LIBNCCL_DEV_PACKAGE -NV_LIBNCCL_DEV_PACKAGE_VERSION -NVIDIA_REQUIRE_CUDA -NV_LIBCUBLAS_DEV_PACKAGE -NV_NVTX_VERSION -NV_CUDA_CUDART_DEV_VERSION -NV_LIBCUSPARSE_VERSION -NV_LIBNPP_VERSION -NCCL_VERSION -NVIDIA_DRIVER_CAPABILITIES -NV_NVPROF_DEV_PACKAGE -NV_LIBNPP_PACKAGE -NV_LIBNCCL_DEV_PACKAGE_NAME -NV_LIBCUBLAS_DEV_VERSION -NVIDIA_PRODUCT_NAME -NV_LIBCUBLAS_DEV_PACKAGE_NAME -NV_CUDA_CUDART_VERSION -CUDA_VERSION -NV_LIBCUBLAS_PACKAGE -NV_LIBNPP_DEV_PACKAGE -NV_LIBCUBLAS_PACKAGE_NAME -NV_LIBNPP_DEV_VERSION -NV_LIBCUSPARSE_DEV_VERSION -LIBRARY_PATH -NV_CUDA_LIB_VERSION -NVARCH -LD_LIBRARY_PATH -NV_CUDA_COMPAT_PACKAGE -NV_LIBNCCL_PACKAGE -NV_NVPROF_VERSION -NV_LIBNCCL_PACKAGE_NAME -NV_LIBNCCL_PACKAGE_VERSION \ No newline at end of file diff --git a/pytorch/train.Dockerfile b/pytorch/train.Dockerfile deleted file mode 100644 index 6d38575..0000000 --- a/pytorch/train.Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM swr.cn-east-3.myhuaweicloud.com/ish/pytorch:base - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - git git-lfs; \ - rm -rf /var/lib/apt/lists/*; \ - git config --global user.name "ci"; \ - git config --global user.email "ci@ish.org.cn"; \ - pip --disable-pip-version-check --no-cache-dir install -i https://repo.huaweicloud.com/repository/pypi/simple \ - pyyaml - -VOLUME /hubdata - -ONBUILD COPY requirements.txt requirements.txt -ONBUILD COPY local_requirements.txt local_requirements.txt - -ONBUILD RUN set -eux; \ - pip install --disable-pip-version-check --no-cache-dir install -i https://mirrors.aliyun.com/pypi/simple/ \ - -r requirements.txt; \ - pip --disable-pip-version-check --no-cache-dir install -i https://package-reader:glpat-GxMbTBVPTAuyQyfyy4yH@gitlab.ish.org.cn/api/v4/projects/51/packages/pypi/simple \ - -r local_requirements.txt; - -ONBUILD COPY . /usr/src/app/ - -WORKDIR /usr/src/app diff --git a/r/base.Dockerfile b/r/base.Dockerfile index ba18ece..146213f 100644 --- a/r/base.Dockerfile +++ b/r/base.Dockerfile @@ -1,8 +1,6 @@ FROM rocker/tidyverse:4.2.2 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 \ libpng-dev \ diff --git a/r/dev.Dockerfile b/r/dev.Dockerfile deleted file mode 100644 index f99f8d6..0000000 --- a/r/dev.Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM swr.cn-east-3.myhuaweicloud.com/ish/r:base - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - openssh-server sudo \ - curl wget ca-certificates \ - vim git build-essential; \ - rm -rf /var/lib/apt/lists/*; \ - ssh-keygen -A; \ - sed -i -E "s/#?\s*UsePAM\s+.+/UsePAM yes/g" /etc/ssh/sshd_config; \ - sed -i -E "s/#?\s*PasswordAuthentication\s+.+/PasswordAuthentication yes/g" /etc/ssh/sshd_config; \ - mkdir /run/sshd; - -RUN set -eux; \ - useradd -s /bin/bash --uid 1001 -U -m dev; \ - echo "dev:dev" | chpasswd; \ - usermod -aG sudo dev; - -WORKDIR /home/dev