Skip to content
Snippets Groups Projects
Commit 5684d62d authored by Matthias Feyll's avatar Matthias Feyll :cookie:
Browse files

(ui): added docker image versions

parent 052c0dd4
No related branches found
No related tags found
1 merge request!1166Ui containerlab integration
Pipeline #258998 passed
...@@ -4,6 +4,8 @@ variables: ...@@ -4,6 +4,8 @@ variables:
GOSDN_INTEGRATION_TEST_IMAGE: "${CI_REGISTRY_IMAGE}/integration-tests:${CI_COMMIT_SHA}" GOSDN_INTEGRATION_TEST_IMAGE: "${CI_REGISTRY_IMAGE}/integration-tests:${CI_COMMIT_SHA}"
CEOS_IMAGE: "${CI_PCONTAINERS_REGISTRY_IMAGE}/ceos:4.28.2F" CEOS_IMAGE: "${CI_PCONTAINERS_REGISTRY_IMAGE}/ceos:4.28.2F"
GOLANG_VERSION: "1.23" GOLANG_VERSION: "1.23"
NODE_VERSION: "23"
NGINX_VERSION: "1.27"
GNMI_TARGET_IMAGE: registry.code.fbi.h-da.de/danet/gnmi-target/debian:master GNMI_TARGET_IMAGE: registry.code.fbi.h-da.de/danet/gnmi-target/debian:master
GNMI_TARGET_INTEGRATION_IMAGE: "$CI_REGISTRY_IMAGE/gnmi-target-integration-test:${CI_COMMIT_SHA}" GNMI_TARGET_INTEGRATION_IMAGE: "$CI_REGISTRY_IMAGE/gnmi-target-integration-test:${CI_COMMIT_SHA}"
DOCKER_TLS_CERTDIR: "/certs" DOCKER_TLS_CERTDIR: "/certs"
......
...@@ -78,7 +78,7 @@ build-inventory-manager-image: ...@@ -78,7 +78,7 @@ build-inventory-manager-image:
build-react-ui-image: build-react-ui-image:
script: script:
- REACT_UI_IMAGE_NAME="${CI_REGISTRY_IMAGE}/react-ui" - REACT_UI_IMAGE_NAME="${CI_REGISTRY_IMAGE}/react-ui"
- docker buildx build -t "$REACT_UI_IMAGE_NAME:$CI_COMMIT_SHA" -f "${CI_PROJECT_DIR}/react-ui/docker/webserver/Dockerfile" --build-arg "GOLANG_VERSION=$GOLANG_VERSION" --build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/" . - docker buildx build -t "$REACT_UI_IMAGE_NAME:$CI_COMMIT_SHA" -f "${CI_PROJECT_DIR}/react-ui/docker/webserver/Dockerfile" --build-arg "NODE_VERSION=$NODE_VERSION" --build-arg "NGINX_VERSION=$NGINX_VERSION" --build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/" .
- docker push "$REACT_UI_IMAGE_NAME:$CI_COMMIT_SHA" - docker push "$REACT_UI_IMAGE_NAME:$CI_COMMIT_SHA"
- docker tag "$REACT_UI_IMAGE_NAME:$CI_COMMIT_SHA" "$REACT_UI_IMAGE_NAME:$CI_COMMIT_REF_SLUG" - docker tag "$REACT_UI_IMAGE_NAME:$CI_COMMIT_SHA" "$REACT_UI_IMAGE_NAME:$CI_COMMIT_REF_SLUG"
- docker push "$REACT_UI_IMAGE_NAME:$CI_COMMIT_REF_SLUG" - docker push "$REACT_UI_IMAGE_NAME:$CI_COMMIT_REF_SLUG"
......
FROM ${GITLAB_PROXY}node:$GOLANG_VERSION-alpine as builder ARG NODE_VERSION=23
ARG NGINX_VERSION=1.27
ARG GITLAB_PROXY
FROM ${GITLAB_PROXY}node:$NODE_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 COPY ./react-ui /app/react-ui
...@@ -6,7 +10,7 @@ COPY ./react-ui /app/react-ui ...@@ -6,7 +10,7 @@ COPY ./react-ui /app/react-ui
RUN cd /app/react-ui && yarn && yarn build RUN cd /app/react-ui && yarn && yarn build
# webserver # webserver
FROM ${GITLAB_PROXY}nginx:$GOLANG_VERSION-alpine FROM ${GITLAB_PROXY}nginx:$NGINX_VERSION-alpine
COPY --from=builder /app/react-ui/dist /usr/share/nginx/html 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 COPY --from=builder /app/react-ui/docker/webserver/nginx.conf /etc/nginx/nginx.conf
EXPOSE 80 EXPOSE 80
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment