Skip to content

Commit 5828434

Browse files
haobibohaobibo
committed
Update docker.yml
1 parent f815998 commit 5828434

File tree

2 files changed

+25
-21
lines changed

2 files changed

+25
-21
lines changed

‎.github/workflows/docker.yml

+22-19
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,11 @@ jobs:
142142
- uses: actions/checkout@v3
143143
- run: |
144144
source ./tool.sh
145-
build_image jdk17 latest docker_core/Dockerfile --build-arg "ARG_PROFILE_JAVA=base" --build-arg "VERSION_JDK=17" && push_image
146-
build_image jdk11 latest docker_core/Dockerfile --build-arg "ARG_PROFILE_JAVA=base" --build-arg "VERSION_JDK=11" && alias_image jdk11 latest jdk latest && push_image
147-
build_image jdk8 latest docker_core/Dockerfile --build-arg "ARG_PROFILE_JAVA=base" --build-arg "VERSION_JDK=8" && push_image
145+
build_image jdk17 latest docker_core/Dockerfile --build-arg "ARG_PROFILE_JAVA=base" --build-arg "VERSION_JDK=17"
146+
build_image jdk11 latest docker_core/Dockerfile --build-arg "ARG_PROFILE_JAVA=base" --build-arg "VERSION_JDK=11"
147+
build_image jdk8 latest docker_core/Dockerfile --build-arg "ARG_PROFILE_JAVA=base" --build-arg "VERSION_JDK=8"
148+
alias_image jdk11 latest jdk latest
149+
push_image jdk
148150
149151
qpod_julia:
150152
name: qpod/julia
@@ -173,11 +175,11 @@ jobs:
173175
- uses: actions/checkout@v3
174176
- run: |
175177
source ./tool.sh
176-
build_image cuda_11.6 latest docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:11.6.2-cudnn8-devel-ubuntu20.04"
177-
build_image cuda_11.6 latest docker_base/Dockerfile --build-arg "BASE_IMG=cuda_11.6"
178-
build_image cuda_11.6 latest docker_cuda/Dockerfile --build-arg "BASE_IMG=cuda_11.6"
178+
build_image tmp latest docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:11.6.2-cudnn8-devel-ubuntu20.04" && docker rmi nvidia/cuda:11.6.2-cudnn8-devel-ubuntu20.04
179+
build_image tmp latest docker_base/Dockerfile --build-arg "BASE_IMG=tmp"
180+
build_image cuda_11.6 latest docker_cuda/Dockerfile --build-arg "BASE_IMG=tmp"
179181
alias_image cuda_11.6 latest cuda latest
180-
push_image
182+
push_image cuda
181183
182184
qpod_cuda_11_2:
183185
name: qpod/cuda_11.2
@@ -186,11 +188,10 @@ jobs:
186188
- uses: actions/checkout@v3
187189
- run: |
188190
source ./tool.sh
189-
build_image cuda_11.2 latest docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04"
190-
build_image cuda_11.2 latest docker_base/Dockerfile --build-arg "BASE_IMG=cuda_11.2"
191-
build_image cuda_11.2 latest docker_cuda/Dockerfile --build-arg "BASE_IMG=cuda_11.2"
192-
alias_image cuda_11.2 latest cuda latest
193-
push_image
191+
build_image tmp latest docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04" docker rmi nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04
192+
build_image tmp latest docker_base/Dockerfile --build-arg "BASE_IMG=tmp"
193+
build_image cuda_11.2 latest docker_cuda/Dockerfile --build-arg "BASE_IMG=tmp"
194+
push_image cuda
194195
195196
# For legacy torch/paddle support
196197
qpod_cuda_10_2:
@@ -200,22 +201,24 @@ jobs:
200201
- uses: actions/checkout@v3
201202
- run: |
202203
source ./tool.sh
203-
build_image cuda_10.2 latest docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:10.2-cudnn8-devel-ubuntu18.04"
204-
build_image cuda_10.2 latest docker_base/Dockerfile --build-arg "BASE_IMG=cuda_10.2"
205-
build_image cuda_10.2 latest docker_cuda/Dockerfile --build-arg "BASE_IMG=cuda_10.2" && push_image
204+
build_image tmp latest docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:10.2-cudnn8-devel-ubuntu18.04" && docker rmi nvidia/cuda:10.2-cudnn8-devel-ubuntu18.04
205+
build_image tmp latest docker_base/Dockerfile --build-arg "BASE_IMG=tmp"
206+
build_image cuda_10.2 latest docker_cuda/Dockerfile --build-arg "BASE_IMG=tmp"
207+
push_image cuda
206208
207209
# cuda_10.0 - for legacy tensorflow 1.15 support
208-
# For cuda version 10.0, the image is solely serverd for legacy tensorflow 1.15, which requires python 3.7
210+
# The cuda version 10.0 image is solely serverd for legacy tensorflow 1.15, which requires python 3.7
209211
qpod_cuda_10_0:
210212
name: qpod/cuda_10.0
211213
runs-on: ubuntu-latest
212214
steps:
213215
- uses: actions/checkout@v3
214216
- run: |
215217
source ./tool.sh
216-
build_image cuda_10.0 latest docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:10.0-cudnn7-devel-ubuntu18.04"
217-
build_image cuda_10.0 latest docker_base/Dockerfile --build-arg "BASE_IMG=cuda_10.0" --build-arg "PYTHON_VERSION=3.7"
218-
build_image cuda_10.0 latest docker_cuda/Dockerfile --build-arg "BASE_IMG=cuda_10.0" && push_image
218+
build_image tmp latest docker_atom/Dockerfile --build-arg "BASE_IMG=nvidia/cuda:10.0-cudnn7-devel-ubuntu18.04" && docker rmi nvidia/cuda:10.0-cudnn7-devel-ubuntu18.04
219+
build_image tmp latest docker_base/Dockerfile --build-arg "BASE_IMG=tmp" --build-arg "PYTHON_VERSION=3.7"
220+
build_image cuda_10.0 latest docker_cuda/Dockerfile --build-arg "BASE_IMG=tmp"
221+
push_image cuda
219222
220223
221224
qpod_tf1:

‎docker_base/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ RUN source /opt/utils/script-setup.sh \
1616
&& echo "Install Mamba:" && setup_mamba \
1717
&& echo "Install Python ${PYTHON_VERSION} and conda:" && setup_conda_with_mamba ${PYTHON_VERSION} \
1818
&& echo "Replace system Python3 with conda Python - note that /bin and /sbin are symlinks of /usr/bin in docker image ubuntu" \
19+
&& PYTHON_VERSION_DEFAULT=$(py3versions -v -i) \
20+
&& sed -i "s/${PYTHON_VERSION_DEFAULT}/${PYTHON_VERSION}/g" /usr/share/python3/debian_defaults \
1921
&& PYTHON_PTH_FILE=$("${CONDA_PREFIX}"/bin/python3 -c 'import sys;print(sys.path[-1]+"/usr_share.pth")') \
2022
&& echo "/usr/share/pyshared/" >> "${PYTHON_PTH_FILE}" \
2123
&& echo "/usr/share/python3/" >> "${PYTHON_PTH_FILE}" \
2224
&& rm -rf $(/usr/bin/python3 -c 'import sys; print(" ".join(i for i in sys.path if "python" in i))') /usr/bin/python3* \
2325
&& ln -sf "${CONDA_PREFIX}"/bin/python3.* /usr/bin/ \
2426
&& ln -sf /usr/bin/python${PYTHON_VERSION} /usr/bin/python \
2527
&& ln -sf /usr/bin/python${PYTHON_VERSION} /usr/bin/python3 \
26-
&& sed -i "s/3.8/${PYTHON_VERSION}/g" /usr/share/python3/debian_defaults \
27-
&& py3versions -i && lsb_release -a \
28+
&& lsb_release -a && py3versions -d \
2829
&& install__clean

0 commit comments

Comments
 (0)