diff --git a/docker/DebugDockerfile b/docker/DebugDockerfile index 624e73129..6511ec221 100644 --- a/docker/DebugDockerfile +++ b/docker/DebugDockerfile @@ -2,7 +2,13 @@ FROM ubuntu:20.04 LABEL maintainer="Team ACID @ Zalando " # We need root certificates to deal with teams api over https -RUN apk --no-cache add ca-certificates go git musl-dev +RUN apt-get update \ + && apt-get install --no-install-recommends -y \ + curl \ + ca-certificates \ + go \ + git \ + musl-dev COPY build/* / diff --git a/docker/Dockerfile b/docker/Dockerfile index 60dda68d9..e64b3733a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,8 +2,10 @@ FROM ubuntu:20.04 LABEL maintainer="Team ACID @ Zalando " # We need root certificates to deal with teams api over https -RUN apk --no-cache add curl -RUN apk --no-cache add ca-certificates +RUN apt-get update \ + && apt-get install --no-install-recommends -y \ + curl \ + ca-certificates COPY build/* / diff --git a/docker/logical-backup/Dockerfile b/docker/logical-backup/Dockerfile index 0f6a3d870..59d11da15 100644 --- a/docker/logical-backup/Dockerfile +++ b/docker/logical-backup/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:20.04 LABEL maintainer="Team ACID @ Zalando " SHELL ["/bin/bash", "-o", "pipefail", "-c"] -RUN apt-get update \ +RUN apt-get update \ && apt-get install --no-install-recommends -y \ apt-utils \ ca-certificates \ diff --git a/docs/developer.md b/docs/developer.md index 3316ac4cc..61a865874 100644 --- a/docs/developer.md +++ b/docs/developer.md @@ -175,7 +175,7 @@ go get -u github.com/derekparker/delve/cmd/dlv * Add following dependencies to the `Dockerfile` ``` -RUN apk --no-cache add go git musl-dev +RUN apt-get update && apt-get install -y go git musl-dev RUN go get github.com/derekparker/delve/cmd/dlv ``` diff --git a/ui/Dockerfile b/ui/Dockerfile index 3711019e3..2058706a4 100644 --- a/ui/Dockerfile +++ b/ui/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="Team ACID @ Zalando " EXPOSE 8081 RUN \ - apk add --no-cache \ + apt-get add --no-cache \ alpine-sdk \ autoconf \ automake \ @@ -25,8 +25,7 @@ RUN \ && \ rm -rf \ /root/.cache \ - /tmp/* \ - /var/cache/apk/* + /tmp/* COPY requirements.txt / COPY start_server.sh / diff --git a/ui/run_local.sh b/ui/run_local.sh index 79723680a..06cfcfa8b 100755 --- a/ui/run_local.sh +++ b/ui/run_local.sh @@ -67,7 +67,7 @@ kubectl exec \ )" \ -- \ sh -c ' - apk add --no-cache socat; + apt-get add --no-cache socat; pkill socat; socat -v TCP-LISTEN:1234,reuseaddr,fork,su=nobody TCP:169.254.169.254:80 ' \