From ff8e1665b59482a9026dd258b16e1909d8c000d8 Mon Sep 17 00:00:00 2001
From: Ryan Eberhard <ryan.eberhard@oracle.com>
Date: Fri, 23 Oct 2020 16:43:45 -0400
Subject: [PATCH 1/3] Use oracle:root to support running in the OpenShift
 restrictive SCC

---
 Dockerfile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fa80df2bf82..b3b7404ff80 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,17 +43,16 @@ RUN set -eux; \
         alternatives --install "/usr/bin/$base" "$base" "$bin" 20000; \
     done; \
     java -Xshare:dump; \
-    groupadd -g 1000 oracle; \
-    useradd -d /operator -M -s /bin/bash -g 1000 -u 1000 oracle; \
+    useradd -d /operator -M -s /bin/bash -g root -u 1000 oracle; \
     mkdir -p /operator/lib; \
     mkdir /logs; \
-    chown -R 1000:1000 /operator /logs
+    chown -R oracle:root /operator /logs
 
-USER 1000
+USER oracle
 
-COPY src/scripts/* /operator/
-COPY operator/target/weblogic-kubernetes-operator.jar /operator/weblogic-kubernetes-operator.jar
-COPY operator/target/lib/*.jar /operator/lib/
+COPY --chown=oracle:root src/scripts/* /operator/
+COPY --chown=oracle:root operator/target/weblogic-kubernetes-operator.jar /operator/weblogic-kubernetes-operator.jar
+COPY --chown=oracle:root operator/target/lib/*.jar /operator/lib/
 
 HEALTHCHECK --interval=1m --timeout=10s \
   CMD /operator/livenessProbe.sh

From 5977079294d6fbcf93efafb46ffa5b8a335e90e0 Mon Sep 17 00:00:00 2001
From: Ryan Eberhard <ryan.eberhard@oracle.com>
Date: Thu, 29 Oct 2020 11:27:07 -0400
Subject: [PATCH 2/3] Fix issues found in test

---
 Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cf3d4d36e8a..1e3928fa359 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,8 +44,10 @@ RUN set -eux; \
     done; \
     java -Xshare:dump; \
     useradd -d /operator -M -s /bin/bash -g root -u 1000 oracle; \
-    mkdir -p /operator/lib; \
-    mkdir /logs; \
+    mkdir -m 775 /operator; \
+    mkdir -m 775 /logs; \
+    mkdir /operator/lib; \
+    mkdir -m 775 -p /operator/internal-identity /operator/external-identity; \
     chown -R oracle:root /operator /logs
 
 USER oracle

From beb09143a7511a55cd90bbbc43f72efa417d481e Mon Sep 17 00:00:00 2001
From: Ryan Eberhard <ryan.eberhard@oracle.com>
Date: Fri, 30 Oct 2020 17:56:33 -0400
Subject: [PATCH 3/3] Clean-up

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1e3928fa359..7574b0d274f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,7 +47,6 @@ RUN set -eux; \
     mkdir -m 775 /operator; \
     mkdir -m 775 /logs; \
     mkdir /operator/lib; \
-    mkdir -m 775 -p /operator/internal-identity /operator/external-identity; \
     chown -R oracle:root /operator /logs
 
 USER oracle