Skip to content
Snippets Groups Projects
Commit 6db5e5e5 authored by Maarten de Waard's avatar Maarten de Waard :angel:
Browse files

Merge branch 'fix_docker_build' into 'main'

Fix docker build and upgrade requirements

See merge request stackspin/stackspin!710
parents b010cf25 ee7ccbbe
No related branches found
No related tags found
No related merge requests found
......@@ -13,7 +13,7 @@ ADD https://github.com/fluxcd/flux2/releases/download/v0.22.0/flux_0.22.0_linux_
COPY ./requirements.txt /requirements.txt
RUN \
# Install kubectl from alpine edge until alpine 3.16 is released
apk --no-cache add kubectl=~1.22.4-r0 \
apk --no-cache add kubectl=~1.23.1-r0 \
--repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing && \
apk --no-cache add \
bash=~5.1.8-r0 \
......
......@@ -78,7 +78,7 @@ pynacl==1.4.0
# via paramiko
pyopenssl==21.0.0
# via -r requirements.in
pyparsing==2.4.7
pyparsing==3.0.6
# via packaging
pytest==6.2.5
# via
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment