Merge pull request #8492 from liranmauda/liran-update-dockerfiles

Update the Dockerfiles
noobaa · Nov 4, 2024 · 07f1582 · 07f1582
2 parents 64336ec + 6ece4f9
commit 07f1582
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/src/deploy/NVA_build/Base.Dockerfile b/src/deploy/NVA_build/Base.Dockerfile
@@ -1,4 +1,4 @@
-FROM noobaa-builder
+FROM noobaa-builder AS noobaa-base
 
 ######################################################################
 # Layers:

diff --git a/src/deploy/NVA_build/NooBaa.Dockerfile b/src/deploy/NVA_build/NooBaa.Dockerfile
@@ -1,5 +1,5 @@
 ARG CENTOS_VER=9
-FROM noobaa-base as server_builder
+FROM noobaa-base AS server_builder
 
 RUN mkdir -p /noobaa_init_files && \
     cp -p ./build/Release/kube_pv_chown /noobaa_init_files
@@ -39,18 +39,18 @@ RUN tar \
 #   Cache: Rebuild when any layer is changing
 ##############################################################
 
-FROM quay.io/centos/centos:stream${CENTOS_VER}
+FROM quay.io/centos/centos:stream${CENTOS_VER} AS noobaa
 
 # The ports are overridden for Ceph Test later
-ENV container docker
-ENV PORT 8080
-ENV SSL_PORT 8443
-ENV ENDPOINT_PORT 6001
-ENV ENDPOINT_SSL_PORT 6443
-ENV WEB_NODE_OPTIONS ''
-ENV BG_NODE_OPTIONS ''
-ENV HOSTED_AGENTS_NODE_OPTIONS ''
-ENV ENDPOINT_NODE_OPTIONS ''
+ENV container=docker
+ENV PORT=8080
+ENV SSL_PORT=8443
+ENV ENDPOINT_PORT=6001
+ENV ENDPOINT_SSL_PORT=6443
+ENV WEB_NODE_OPTIONS=''
+ENV BG_NODE_OPTIONS=''
+ENV HOSTED_AGENTS_NODE_OPTIONS=''
+ENV ENDPOINT_NODE_OPTIONS=''
 
 ##############################################################
 # Layers:
@@ -153,7 +153,7 @@ EXPOSE 27000
 EXPOSE 26050
 
 # Needs to be added only after installing jemalloc in dependencies section (our env section is before) - otherwise it will fail
-ENV LD_PRELOAD /usr/lib64/libjemalloc.so.2
+ENV LD_PRELOAD=/usr/lib64/libjemalloc.so.2
 
 #RUN mkdir -p /nsfs/fs1/amitpb && chmod -R 777 /nsfs/
 #RUN mkdir -p /nsfsAA/fs1/amitpb && chmod -R 777 /nsfsAA/

diff --git a/src/deploy/NVA_build/Tests.Dockerfile b/src/deploy/NVA_build/Tests.Dockerfile
@@ -1,9 +1,9 @@
-FROM noobaa
+FROM noobaa AS noobaa-tester
 
 USER 0:0
 
-ENV container docker
-ENV TEST_CONTAINER true
+ENV container=docker
+ENV TEST_CONTAINER=true
 
 ##############################################################
 # Layers:
@@ -13,6 +13,7 @@ ENV TEST_CONTAINER true
 ##############################################################
 
 RUN dnf config-manager --enable crb || true
+RUN dnf clean all
 
 RUN dnf group install -y -q "Development Tools" && \
     dnf install -y -q --nogpgcheck vim \
@@ -62,7 +63,7 @@ COPY .eslintignore /root/node_modules/noobaa-core
 # Making mocha accessible 
 RUN ln -s /root/node_modules/noobaa-core/node_modules/mocha/bin/mocha.js /usr/local/bin
 
-ENV SPAWN_WRAP_SHIM_ROOT /data
+ENV SPAWN_WRAP_SHIM_ROOT=/data
 RUN mkdir -p /data && \
     chgrp -R 0 /data && \
     chmod -R g=u /data 

diff --git a/src/deploy/NVA_build/builder.Dockerfile b/src/deploy/NVA_build/builder.Dockerfile
@@ -1,5 +1,5 @@
 ARG CENTOS_VER=9
-FROM quay.io/centos/centos:stream${CENTOS_VER}
+FROM quay.io/centos/centos:stream${CENTOS_VER} AS noobaa-builder
 #Needs to reapply ARG, it was cleaned by FROM command.
 ARG CENTOS_VER
 LABEL maintainer="Liran Mauda (lmauda@redhat.com)"

diff --git a/src/deploy/NVA_build/dev.Dockerfile b/src/deploy/NVA_build/dev.Dockerfile
@@ -2,7 +2,7 @@
 ARG CENTOS_VER=9
 FROM quay.io/centos/centos:stream${CENTOS_VER}
 
-ENV container docker
+ENV container=docker
 
 RUN dnf update -y -q && \
     dnf install -y -q \