From 93f9ca6aff6ff10ec00d77c19eb3d048e6aa8b98 Mon Sep 17 00:00:00 2001
From: Felix Kunde <felix-kunde@gmx.de>
Date: Thu, 7 Jan 2021 09:19:38 +0100
Subject: [PATCH] more to revert

---
 docker/DebugDockerfile | 2 +-
 docker/Dockerfile      | 2 +-
 docs/developer.md      | 4 ++--
 ui/Dockerfile          | 5 +++--
 ui/run_local.sh        | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docker/DebugDockerfile b/docker/DebugDockerfile
index db625dec4..0bfe9a277 100644
--- a/docker/DebugDockerfile
+++ b/docker/DebugDockerfile
@@ -16,4 +16,4 @@ RUN chown -R pgo:pgo /dlv
 USER pgo:pgo
 RUN ls -l /
 
-CMD ["/dlv", "--listen=:7777", "--headless=true", "--api-version=2", "exec", "/postgres-operator"]
\ No newline at end of file
+CMD ["/dlv", "--listen=:7777", "--headless=true", "--api-version=2", "exec", "/postgres-operator"]
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e117bae5e..bf844850f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,4 +12,4 @@ RUN adduser -D -u 1000 -G pgo -g 'Postgres Operator' pgo
 
 USER 1000:1000
 
-ENTRYPOINT ["/postgres-operator"]
\ No newline at end of file
+ENTRYPOINT ["/postgres-operator"]
diff --git a/docs/developer.md b/docs/developer.md
index 61a865874..e54d5d28c 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 apt-get update && apt-get install -y go git musl-dev
+RUN apk --no-cache add go git musl-dev
 RUN go get github.com/derekparker/delve/cmd/dlv
 ```
 
@@ -239,7 +239,7 @@ kubectl logs acid-minimal-cluster-0
 
 The operator provides reference end-to-end (e2e) tests to
 ensure various infrastructure parts work smoothly together. The test code is available at `e2e/tests`.
-The special `registry.opensource.zalan.do/acid/postgres-operator-e2e-tests-runner` image is used to run the tests. The container mounts the local `e2e/tests` directory at runtime, so whatever you modify in your local copy of the tests will be executed by a test runner. By maintaining a separate test runner image we avoid the need to re-build the e2e test image on every build. 
+The special `registry.opensource.zalan.do/acid/postgres-operator-e2e-tests-runner` image is used to run the tests. The container mounts the local `e2e/tests` directory at runtime, so whatever you modify in your local copy of the tests will be executed by a test runner. By maintaining a separate test runner image we avoid the need to re-build the e2e test image on every build.
 
 Each e2e execution tests a Postgres Operator image built from the current git branch. The test
 runner creates a new local K8s cluster using [kind](https://kind.sigs.k8s.io/),
diff --git a/ui/Dockerfile b/ui/Dockerfile
index cce9ba336..035629681 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="Team ACID @ Zalando <team-acid@zalando.de>"
 EXPOSE 8081
 
 RUN \
-  apt-get add --no-cache \
+  apk add --no-cache \
     alpine-sdk \
     autoconf \
     automake \
@@ -25,7 +25,8 @@ RUN \
     && \
   rm -rf \
     /root/.cache \
-    /tmp/*
+    /tmp/* \
+    /var/cache/apk/*
 
 COPY requirements.txt /
 COPY start_server.sh /
diff --git a/ui/run_local.sh b/ui/run_local.sh
index 06cfcfa8b..79723680a 100755
--- a/ui/run_local.sh
+++ b/ui/run_local.sh
@@ -67,7 +67,7 @@ kubectl exec \
   )" \
   -- \
     sh -c '
-      apt-get add --no-cache socat;
+      apk add --no-cache socat;
       pkill socat;
       socat -v TCP-LISTEN:1234,reuseaddr,fork,su=nobody TCP:169.254.169.254:80
     ' \