From bb8d3387bd66f50fdf082341114d5706a8ebc817 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Wed, 27 Nov 2024 11:28:15 +0000 Subject: [PATCH] Use httpd:alpine image in base image and other maven repo images (#631) * fix: Use httpd:alpine image in base image and other maven repo images Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> * chore: Remove unused cli dockerfile Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --------- Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- dockerfiles/base/base-dockerfile | 2 +- dockerfiles/cli/cli-binary-dockerfile | 6 ------ dockerfiles/release/resources/resources-dockerfile | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 dockerfiles/cli/cli-binary-dockerfile diff --git a/dockerfiles/base/base-dockerfile b/dockerfiles/base/base-dockerfile index cbd75940..fa5ed92b 100644 --- a/dockerfiles/base/base-dockerfile +++ b/dockerfiles/base/base-dockerfile @@ -1,4 +1,4 @@ -FROM harbor.galasa.dev/docker_proxy_cache/library/httpd:2.4.59 +FROM harbor.galasa.dev/docker_proxy_cache/library/httpd:alpine RUN rm -v /usr/local/apache2/htdocs/* COPY dockerfiles/httpdconf/base-httpd.conf /usr/local/apache2/conf/httpd.conf \ No newline at end of file diff --git a/dockerfiles/cli/cli-binary-dockerfile b/dockerfiles/cli/cli-binary-dockerfile deleted file mode 100644 index 5283d15b..00000000 --- a/dockerfiles/cli/cli-binary-dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM harbor.galasa.dev/docker_proxy_cache/library/httpd:2.4.59 - -RUN rm -v /usr/local/apache2/htdocs/* -COPY automation/dockerfiles/httpdconf/base-httpd.conf /usr/local/apache2/conf/httpd.conf - -COPY cli/bin/galasactl* /usr/local/apache2/htdocs/ \ No newline at end of file diff --git a/dockerfiles/release/resources/resources-dockerfile b/dockerfiles/release/resources/resources-dockerfile index 39118a9a..e68e39d5 100644 --- a/dockerfiles/release/resources/resources-dockerfile +++ b/dockerfiles/release/resources/resources-dockerfile @@ -1,4 +1,4 @@ -FROM harbor.galasa.dev/docker_proxy_cache/library/httpd:2.4.59 +FROM harbor.galasa.dev/docker_proxy_cache/library/httpd:alpine ARG branch ARG version