Skip to content

CI: Fix broken docker tasks #620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dubious90 merged 1 commit into from
Feb 5, 2021
Merged

CI: Fix broken docker tasks #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/docker/Dockerfile-nighthawk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM frolvlad/alpine-glibc
FROM frolvlad/alpine-glibc:alpine-3.13_glibc-2.32

ADD nighthawk_client /usr/local/bin/nighthawk_client
ADD nighthawk_test_server /usr/local/bin/nighthawk_test_server
Expand Down
4 changes: 2 additions & 2 deletions ci/docker/Dockerfile-nighthawk-benchmark
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM frolvlad/alpine-glibc
FROM frolvlad/alpine-glibc:alpine-3.13_glibc-2.32

CMD ["./benchmarks" "--help"]
ENV RUNFILES_DIR=/usr/local/bin/benchmarks/benchmarks.runfiles
Expand All @@ -8,7 +8,7 @@ WORKDIR /usr/local/bin/benchmarks

COPY benchmarks /usr/local/bin/benchmarks/

RUN apk add --no-cache docker=20.10.2-r0 openrc=0.42.1-r19 python3>=3.8.5
RUN apk add --no-cache docker=20.10.3-r0 openrc=0.42.1-r19 python3=3.8.7-r0
RUN rc-update add docker boot

RUN if [ ! -e /usr/bin/python ]; then ln -sf python3 /usr/bin/python; fi && \
Expand Down