File tree 5 files changed +9
-10
lines changed
5 files changed +9
-10
lines changed Original file line number Diff line number Diff line change @@ -361,4 +361,4 @@ jobs:
361
361
--env-file /tmp/docker.env \
362
362
-v $(pwd):/tmp \
363
363
-w /tmp \
364
- qpod/docker-kit python /opt/utils/image-syncer/run_jobs.py
364
+ ${DOCKER_IMG_PREFIX:- qpod} /docker-kit python /opt/utils/image-syncer/run_jobs.py
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ RUN set -x && cd /tmp \
33
33
&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 \
34
34
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen \
35
35
&& echo "ALL ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers \
36
- && mv /root/.bashrc /etc/profile.d/bash.bashrc \
36
+ && mv /root/.bashrc /etc/profile.d/bash.bashrc.sh \
37
37
&& LINE_SET_FLAG='export ENTER_PROFILE=$(date +%Y.%m%d.%H%M)' \
38
38
&& LINE_CHK_FLAG='[ $BASH ] && [ -f /etc/profile ] && [ -z $ENTER_PROFILE ] && . /etc/profile' \
39
39
# Add a check variable `ENTER_PROFILE` to see if /etc/profile is executed or not
Original file line number Diff line number Diff line change 40
40
&& conda update --all --quiet --yes
41
41
42
42
# remove non-necessary folder/symlink "python3.1" exists
43
- rm -rf " ${CONDA_PREFIX} " /bin/python3.1
43
+ rm -rf " ${CONDA_PREFIX} " /bin/python3.1 " ${CONDA_PREFIX} " /lib/python3.1
44
44
45
45
# These conda pkgs shouldn't be removed (otherwise will cause RemoveError) since they are directly required by conda: pip setuptools pycosat pyopenssl requests ruamel_yaml
46
46
# CONDA_PY_PKGS=$(conda list | grep "py3" | cut -d " " -f 1 | sed "/#/d;/conda/d;/pip/d;/setuptools/d;/pycosat/d;/pyopenssl/d;/requests/d;/ruamel_yaml/d;") \
@@ -112,7 +112,7 @@ setup_java_base() {
112
112
elif [ " $VER_JDK " -gt 8 ] ; then
113
113
URL_OPENJDK=${JDK_URL_MSFT}
114
114
else
115
- echo " ORCA download URL ref: ${JDK_URL_ORCA} "
115
+ echo " ORCA JDK8 download URL ref: ${JDK_URL_ORCA} "
116
116
URL_OPENJDK=" https://javadl.oracle.com/webapps/download/GetFile/1.8.0_361-b09/0ae14417abb444ebb02b9815e2103550/linux-i586/jdk-8u361-linux-${ARCH} .tar.gz"
117
117
fi
118
118
Original file line number Diff line number Diff line change @@ -24,8 +24,7 @@ RUN set -x && source /opt/utils/script-setup.sh \
24
24
&& PYTHON_PTH_FILE=$("${CONDA_PREFIX}" /bin/python3 -c 'import sys;print(sys.path[-1]+"/usr_share.pth")' ) \
25
25
&& echo "/usr/share/pyshared/" >> "${PYTHON_PTH_FILE}" \
26
26
&& echo "/usr/share/python3/" >> "${PYTHON_PTH_FILE}" \
27
- && rm -rf $(/usr/bin/python3 -c 'import sys; print(" ".join(i for i in sys.path if "python" in i))' ) /usr/bin/python3* \
28
- && rm -rf "${CONDA_PREFIX}" /lib/python3.1 /usr/lib/python${PYTHON_VERSION} \
27
+ && rm -rf $(/usr/bin/python3 -c 'import sys; print(" ".join(i for i in sys.path if "python" in i))' ) /usr/bin/python3* /usr/lib/python${PYTHON_VERSION} \
29
28
&& ln -sf "${CONDA_PREFIX}" /lib/python${PYTHON_VERSION} /usr/lib/ \
30
29
&& ln -sf "${CONDA_PREFIX}" /bin/python3.* /usr/bin/ \
31
30
&& ln -sf /usr/bin/python${PYTHON_VERSION} /usr/bin/python \
Original file line number Diff line number Diff line change @@ -5,13 +5,13 @@ ARG BASE_IMG="base"
5
5
FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG}
6
6
7
7
LABEL maintainer="haobibo@gmail.com"
8
+ ENV XDG_RUNTIME_DIR="/tmp"
8
9
9
10
COPY work /opt/utils/
10
11
11
12
RUN source /opt/utils/script-setup.sh \
12
13
&& setup_docker_compose && setup_docker_syncer \
13
14
&& pip install -U PyYaml \
14
- && ln -sf /usr/bin/image-syncer /opt/utils/image-syncer/
15
-
16
- # Clean up and display components version information...
17
- RUN source /opt/utils/script-utils.sh && install__clean && list_installed_packages
15
+ && ln -sf /usr/bin/image-syncer /opt/utils/image-syncer/ \
16
+ # Clean up and display components version information...
17
+ && source /opt/utils/script-utils.sh && install__clean && list_installed_packages
You can’t perform that action at this time.
0 commit comments