Skip to content

Commit 1180910

Browse files
authored
Merge pull request #5 from jianxiaoguo/main
chore(dockerfile): install kubectl
2 parents 3c69434 + f51636e commit 1180910

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

rootfs/Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@ ENV DRYCC_UID=1001 \
44
DRYCC_GID=1001 \
55
DRYCC_HOME_DIR=/workspace \
66
PYTHON_VERSION="3.10.2" \
7-
HELM_VERSION="3.8.0"
7+
HELM_VERSION="3.8.0" \
8+
KUBECTL_VERSION="1.23.4"
89

910
RUN groupadd drycc --gid ${DRYCC_GID} \
1011
&& useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR}
1112

1213
COPY . ${DRYCC_HOME_DIR}
1314
WORKDIR ${DRYCC_HOME_DIR}
1415

15-
RUN buildDeps='musl-dev openssl' \
16-
&& install-packages ${buildDeps} \
16+
RUN buildDeps='musl-dev' \
17+
&& install-packages ${buildDeps} openssl ca-certificates \
1718
&& install-stack python ${PYTHON_VERSION} \
18-
&& install-stack helm ${HELM_VERSION} && . init-stack \
19+
&& install-stack helm ${HELM_VERSION} \
20+
&& install-stack kubectl ${KUBECTL_VERSION} && . init-stack \
1921
&& python3 -m venv ${DRYCC_HOME_DIR}/.venv \
2022
&& source ${DRYCC_HOME_DIR}/.venv/bin/activate \
2123
&& pip3 install --disable-pip-version-check --no-cache-dir -r ${DRYCC_HOME_DIR}/requirements.txt \

rootfs/Dockerfile.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ RUN groupadd drycc --gid ${DRYCC_GID} \
1313
COPY . ${DRYCC_HOME_DIR}
1414
WORKDIR ${DRYCC_HOME_DIR}
1515

16-
RUN buildDeps='musl-dev openssl'; \
17-
install-packages ${buildDeps} \
16+
RUN buildDeps='musl-dev'; \
17+
install-packages ${buildDeps} openssl ca-certificates \
1818
&& install-stack python ${PYTHON_VERSION} \
1919
&& install-stack helm ${HELM_VERSION} \
2020
&& install-stack kubectl ${KUBECTL_VERSION} && . init-stack \

0 commit comments

Comments
 (0)