From ea239cd9a7bb5dd6042916c60c2c47ba88405173 Mon Sep 17 00:00:00 2001 From: Matthias Feyll <matthias.feyll@stud.h-da.de> Date: Thu, 6 Feb 2025 19:53:01 +0100 Subject: [PATCH] (ui): removed hardcoded dockerfile image versions --- react-ui/docker/webserver/Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/react-ui/docker/webserver/Dockerfile b/react-ui/docker/webserver/Dockerfile index 71127c09b..b38a25c39 100644 --- a/react-ui/docker/webserver/Dockerfile +++ b/react-ui/docker/webserver/Dockerfile @@ -1,13 +1,12 @@ -FROM node:alpine3.20 as builder +FROM ${GITLAB_PROXY}node:$GOLANG_VERSION-alpine as builder -COPY ./api/openapiv2/gosdn_northbound.swagger.json /app/api/openapiv2/gosdn_northbound.swagger.json +COPY ./api/openapiv2/gosdn_northbound.swagger.json /app/api/openapiv2/gosdn_northbound.swagger.json COPY ./react-ui /app/react-ui RUN cd /app/react-ui && yarn && yarn build - # webserver -FROM nginx:alpine3.20 +FROM ${GITLAB_PROXY}nginx:$GOLANG_VERSION-alpine COPY --from=builder /app/react-ui/dist /usr/share/nginx/html -COPY --from=builder /app/react-ui/docker/webserver/nginx.conf /etc/nginx/nginx.conf -EXPOSE 80 \ No newline at end of file +COPY --from=builder /app/react-ui/docker/webserver/nginx.conf /etc/nginx/nginx.conf +EXPOSE 80 -- GitLab