Merge pull request #2166 from mattray/ui_fix

Sync Dockerfile and Dockerfile.cross and run as non-root user

kubernetes/opencost.yaml

@@ -167,7 +167,7 @@ spec:
             privileged: false
             readOnlyRootFilesystem: true
             runAsUser: 1001
-        - image: quay.io/kubecost1/opencost-ui:1.105.2
+        - image: quay.io/kubecost1/opencost-ui:latest
           name: opencost-ui
           resources:
             requests:

ui/Dockerfile

@@ -6,20 +6,22 @@ ADD src /opt/ui/src
 RUN npx parcel build src/index.html
 
 FROM nginx:alpine
+
 COPY --from=builder /opt/ui/dist /var/www
 COPY default.nginx.conf /etc/nginx/conf.d/
 COPY nginx.conf /etc/nginx/
+COPY ./docker-entrypoint.sh /usr/local/bin/
+
 RUN rm -rf /etc/nginx/conf.d/default.conf
 
 RUN adduser 1001 -g 1000 -D
 RUN chown 1001:1000 -R /var/www
 RUN chown 1001:1000 -R /etc/nginx
+RUN chown 1001:1000 -R /usr/local/bin/docker-entrypoint.sh
 
 ENV BASE_URL=/model
 
-
 USER 1001
 
-COPY ./docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-CMD ["nginx", "-g", "daemon off;"]
+CMD ["nginx", "-g", "daemon off;"]

ui/Dockerfile.cross

@@ -5,9 +5,12 @@ COPY default.nginx.conf /etc/nginx/conf.d/
 COPY nginx.conf /etc/nginx/
 COPY ./docker-entrypoint.sh /usr/local/bin/
 
+RUN rm -rf /etc/nginx/conf.d/default.conf
+
 RUN adduser 1001 -g 1000 -D
 RUN chown 1001:1000 -R /var/www
 RUN chown 1001:1000 -R /etc/nginx
+RUN chown 1001:1000 -R /usr/local/bin/docker-entrypoint.sh
 
 ENV BASE_URL=/model