From 1919ebff03674b2c2a4493ac743c190fb8c271b7 Mon Sep 17 00:00:00 2001
From: varshaprasad96 <varshaprasad96@gmail.com>
Date: Fri, 10 Sep 2021 09:13:38 -0700
Subject: [PATCH] make modification to dockerfile

Signed-off-by: varshaprasad96 <varshaprasad96@gmail.com>
---
 .../v1alpha/scaffolds/internal/templates/dockerfile.go     | 7 +++----
 .../hybrid/v1alpha/testdata/memcached-operator/Dockerfile  | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates/dockerfile.go b/pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates/dockerfile.go
index 35c426be..12acf069 100644
--- a/pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates/dockerfile.go
+++ b/pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates/dockerfile.go
@@ -63,14 +63,13 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4
 
 ENV HOME=/opt/helm \
     USER_NAME=helm \
-    USER_UID=1001 \
-	G_ID=0
+    USER_UID=1001
 
 RUN echo "${USER_NAME}:x:${USER_UID}:0:${USER_NAME} user:${HOME}:/sbin/nologin" >> /etc/passwd
 
 # Copy necessary files with the right permissions
-COPY --chown=${USER_UID}:${G_ID} watches.yaml ${HOME}/watches.yaml
-COPY --chown=${USER_UID}:${G_ID} helm-charts  ${HOME}/helm-charts
+COPY --chown=${USER_UID}:0 watches.yaml ${HOME}/watches.yaml
+COPY --chown=${USER_UID}:0 helm-charts  ${HOME}/helm-charts
 
 # Copy manager binary
 COPY --from=builder /workspace/manager .
diff --git a/pkg/plugins/hybrid/v1alpha/testdata/memcached-operator/Dockerfile b/pkg/plugins/hybrid/v1alpha/testdata/memcached-operator/Dockerfile
index dabd24b9..6809da41 100644
--- a/pkg/plugins/hybrid/v1alpha/testdata/memcached-operator/Dockerfile
+++ b/pkg/plugins/hybrid/v1alpha/testdata/memcached-operator/Dockerfile
@@ -19,14 +19,13 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4
 
 ENV HOME=/opt/helm \
     USER_NAME=helm \
-    USER_UID=1001 \
-    G_ID=0
+    USER_UID=1001
 
 RUN echo "${USER_NAME}:x:${USER_UID}:0:${USER_NAME} user:${HOME}:/sbin/nologin" >> /etc/passwd
 
 # Copy necessary files with the right permissions
-COPY --chown=${USER_UID}:${G_ID} watches.yaml ${HOME}/watches.yaml
-COPY --chown=${USER_UID}:${G_ID} helm-charts  ${HOME}/helm-charts
+COPY --chown=${USER_UID}:0 watches.yaml ${HOME}/watches.yaml
+COPY --chown=${USER_UID}:0 helm-charts  ${HOME}/helm-charts
 
 # Copy manager binary
 COPY --from=builder /workspace/manager .