fixup! fixup! Merge branch 'main' of https://github.com/redhat-cop/ba…

…bylon

catalog/helm/values.yaml

@@ -49,8 +49,7 @@ ui:
 status:
   name: # default use chart name + '-status'
   image:
-    #override:
-    tag: v0.0.4
+    tag: v0.0.5
     repository: quay.io/redhat-gpte/babylon-catalog-status
     pullPolicy: IfNotPresent
   replicaCount: 1
@@ -61,7 +60,6 @@ status:
     limits:
       cpu: "1"
       memory: "256Mi"
-  host:
 
 oauthProxy:
   name: # default use chart name + '-oauth-proxy'

catalog/status/Dockerfile

@@ -3,21 +3,19 @@ FROM registry.access.redhat.com/ubi9/nginx-120
 # Add application sources to a directory that the assemble script expects them
 # and set permissions so that the container runs without root access
 USER root
-WORKDIR /opt/app-root/src/
+
 ADD nginx-default-cfg/nginx.conf "${NGINX_CONFIGURATION_PATH}"
 ADD nginx-default-cfg/redirect.conf "${NGINX_DEFAULT_CONF_PATH}"
-ADD *.html /opt/app-root/src/
-ADD *.css /opt/app-root/src/
-ADD *.js /opt/app-root/src/
-COPY assets /opt/app-root/src/assets
-COPY interfaces /opt/app-root/src/interfaces
+ADD *.html .
+ADD *.css .
+ADD *.js .
+COPY assets ./assets
+COPY interfaces ./interfaces
 
-RUN chown -R 1001:0 /opt/app-root/src/ && \
-    chmod -R g+w /opt/app-root/src/
 USER 1001
 
-# Run script uses standard ways to run the application
-CMD /usr/libexec/s2i/run
-
 EXPOSE 8080
 EXPOSE 8443
+
+# Run script uses standard ways to run the application
+CMD nginx -g "daemon off;"

helm/values.yaml

@@ -139,7 +139,7 @@ catalog:
           memory: "256Mi"
     status:
       image:
-        tag: v0.0.4
+        tag: v0.0.5
         repository: quay.io/redhat-gpte/babylon-catalog-status
         pullPolicy: IfNotPresent
       replicaCount: 1