Skip to content

Commit 63a434d

Browse files
authored
build: update docker images (#143)
1 parent ff3bd50 commit 63a434d

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

publish-chart/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
FROM docker:24.0.6-git
1+
FROM docker:29.2.1-dind
22

33
# install dependencies
44
RUN apk add python3 py-pip py3-ruamel.yaml && \
55
wget -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/3.1.1/yq_linux_amd64" && \
66
chmod 0755 /usr/bin/yq && \
7+
python3 -m venv /app/.venv && \
78
# requests 2.32.0 has a bug with not allowing docker+http protocol, see requests/issues/6707
8-
pip3 install -U pip chartpress==2.1.0 "requests<2.32.0" && \
9+
/app/.venv/bin/pip3 install pip chartpress==2.1.0 "requests<2.32.0" && \
910
wget -O /tmp/helm.tar.gz "https://get.helm.sh/helm-v3.14.2-linux-amd64.tar.gz" && \
1011
tar -xf /tmp/helm.tar.gz --strip-components=1 -C /usr/bin/ && \
1112
chmod 0755 /usr/bin/helm

publish-chart/publish-chart.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/bin/sh
22
set -xe
33

4+
source /app/.venv/bin/activate
5+
46
if echo $GITHUB_REF | grep "tags" - > /dev/null; then
57
CHART_TAG="--tag $(echo ${GITHUB_REF} | cut -d/ -f3)"
68
fi

publish-chartpress-images/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
FROM docker:24.0.6-git
1+
FROM docker:29.2.1-dind
22

33
# install dependencies
44
# Note: Chartpress 0.7.0 is the latest version compatible until https://github.com/jupyterhub/chartpress/issues/118 is fixed
55
RUN apk add python3 py-pip py3-ruamel.yaml && \
66
wget -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/3.1.1/yq_linux_amd64" && \
77
chmod 0755 /usr/bin/yq && \
8+
python3 -m venv /app/.venv && \
89
# requests 2.32.0 has a bug with not allowing docker+http protocol, see requests/issues/6707
9-
pip3 install -U pip chartpress==2.1.0 "requests<2.32.0" && \
10+
/app/.venv/bin/pip3 install pip chartpress==2.1.0 "requests<2.32.0" && \
1011
wget -O /tmp/helm.tar.gz "https://get.helm.sh/helm-v3.5.2-linux-amd64.tar.gz" && \
1112
tar -xf /tmp/helm.tar.gz --strip-components=1 -C /usr/bin/ && \
1213
chmod 0755 /usr/bin/helm

publish-chartpress-images/publish-images.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/bin/sh
22
set -xe
33

4+
source /app/.venv/bin/activate
5+
46
if echo $GITHUB_REF | grep "tags" - > /dev/null; then
57
CHART_TAG="--tag $(echo ${GITHUB_REF} | cut -d/ -f3)"
68
fi

0 commit comments

Comments
 (0)