From ea6b7a085c0dfaae9c2b3a280f4fa13b24b66b13 Mon Sep 17 00:00:00 2001
From: Felix Kunde <felix-kunde@gmx.de>
Date: Thu, 7 Jan 2021 09:13:46 +0100
Subject: [PATCH] revert changes on Dockerfiles

---
 docker/DebugDockerfile           | 12 +++---------
 docker/Dockerfile                |  6 +++---
 docker/logical-backup/Dockerfile |  4 ++--
 ui/Dockerfile                    |  2 +-
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/docker/DebugDockerfile b/docker/DebugDockerfile
index 6511ec221..db625dec4 100644
--- a/docker/DebugDockerfile
+++ b/docker/DebugDockerfile
@@ -1,14 +1,8 @@
-FROM ubuntu:20.04
+FROM alpine
 LABEL maintainer="Team ACID @ Zalando <team-acid@zalando.de>"
 
 # We need root certificates to deal with teams api over https
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        curl \
-        ca-certificates \
-        go \
-        git \
-        musl-dev
+RUN apk --no-cache add ca-certificates go git musl-dev
 
 COPY build/* /
 
@@ -22,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"]
+CMD ["/dlv", "--listen=:7777", "--headless=true", "--api-version=2", "exec", "/postgres-operator"]
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e64b3733a..d4b6c2e31 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -9,9 +9,9 @@ RUN apt-get update \
 
 COPY build/* /
 
-RUN addgroup -g 1000 pgo
-RUN adduser -D -u 1000 -G pgo -g 'Postgres Operator' pgo
+RUN addgroup --gid 1000 pgo
+RUN adduser pgo --gecos 'Postgres Operator' --uid 1000 --disabled-password --ingroup pgo
 
 USER 1000:1000
 
-ENTRYPOINT ["/postgres-operator"]
+ENTRYPOINT ["/postgres-operator"]
\ No newline at end of file
diff --git a/docker/logical-backup/Dockerfile b/docker/logical-backup/Dockerfile
index 59d11da15..c8bbe6f28 100644
--- a/docker/logical-backup/Dockerfile
+++ b/docker/logical-backup/Dockerfile
@@ -1,8 +1,8 @@
-FROM ubuntu:20.04
+FROM ubuntu:18.04
 LABEL maintainer="Team ACID @ Zalando <team-acid@zalando.de>"
 
 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/ui/Dockerfile b/ui/Dockerfile
index 2058706a4..cce9ba336 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM alpine
 LABEL maintainer="Team ACID @ Zalando <team-acid@zalando.de>"
 
 EXPOSE 8081