From cf37702119e00b73162403b6b8d09550bde959d9 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Tue, 11 Feb 2025 18:11:08 +0000 Subject: [PATCH 1/2] Fix incorrect addgroup and adduser inside CLI docker image Signed-off-by: Jade Carino --- dockerfiles/dockerfile.galasactl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dockerfiles/dockerfile.galasactl b/dockerfiles/dockerfile.galasactl index 6390dc5f..e7589b1b 100644 --- a/dockerfiles/dockerfile.galasactl +++ b/dockerfiles/dockerfile.galasactl @@ -5,8 +5,10 @@ RUN apt-get update \ ARG platform -RUN addgroup galasa && \ - adduser -D -G galasa -h /galasa -s /bin/sh galasa +RUN groupadd -r galasa && \ + useradd -r -g galasa -d /galasa -s /bin/bash galasa && \ + mkdir -p /galasa && \ + chown galasa:galasa /galasa COPY bin/galasactl-${platform} /bin/galasactl RUN chmod +x /bin/galasactl From caf54cfcf803c6f4390727ac6369b6b9d6e0acb8 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 12 Feb 2025 22:21:07 +0000 Subject: [PATCH 2/2] Replace use of images in Harbor with GHCR Signed-off-by: Jade Carino --- dockerfiles/dockerfile.galasactl | 2 +- dockerfiles/dockerfile.galasactl-executables | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dockerfiles/dockerfile.galasactl b/dockerfiles/dockerfile.galasactl index e7589b1b..d055d44c 100644 --- a/dockerfiles/dockerfile.galasactl +++ b/dockerfiles/dockerfile.galasactl @@ -1,4 +1,4 @@ -FROM harbor.galasa.dev/docker_proxy_cache/library/ubuntu:20.04 +FROM ghcr.io/galasa-dev/ubuntu:20.04 RUN apt-get update \ && apt-get install -y ca-certificates diff --git a/dockerfiles/dockerfile.galasactl-executables b/dockerfiles/dockerfile.galasactl-executables index 3e84db2e..f00a0da3 100644 --- a/dockerfiles/dockerfile.galasactl-executables +++ b/dockerfiles/dockerfile.galasactl-executables @@ -1,4 +1,4 @@ -FROM harbor.galasa.dev/docker_proxy_cache/library/httpd:alpine +FROM ghcr.io/galasa-dev/httpd:alpine RUN rm -v /usr/local/apache2/htdocs/* COPY dockerfiles/httpdconf/base-httpd.conf /usr/local/apache2/conf/httpd.conf