From 611843aeffe6cd6151f90e23a6d8bf86236b253b Mon Sep 17 00:00:00 2001 From: Mohamed Hamou Date: Tue, 14 May 2024 11:21:39 +0200 Subject: [PATCH] Add arlas-fam-wui to release script --- .../Dockerfile => Dockerfile-arlas-fam-wui | 12 ++++++------ file-explorer/package-lock.json | 4 ++-- file-explorer/package.json | 4 ++-- release/release.sh | 13 +++++++++++++ 4 files changed, 23 insertions(+), 10 deletions(-) rename file-explorer/Dockerfile => Dockerfile-arlas-fam-wui (78%) diff --git a/file-explorer/Dockerfile b/Dockerfile-arlas-fam-wui similarity index 78% rename from file-explorer/Dockerfile rename to Dockerfile-arlas-fam-wui index 20ed0a3b..de81c22b 100644 --- a/file-explorer/Dockerfile +++ b/Dockerfile-arlas-fam-wui @@ -4,22 +4,22 @@ FROM node:16.19.0 as builder WORKDIR /app -COPY ./package.json ./ -COPY ./package-lock.json ./ +COPY ./file-explorer/package.json ./ +COPY ./file-explorer/package-lock.json ./ ## installing necessary libraries RUN npm install -COPY ./scripts/start.sh ./ +COPY ./file-explorer/scripts/start.sh ./ -COPY . . +COPY ./file-explorer . ## Build the angular app in production mode RUN npm run build ### STAGE 2: Setup ### -FROM nginx:1.23.3-alpine +FROM nginx:1.25.3-alpine3.18-slim ARG version="latest" LABEL io.arlas.wui-fam.version=${version} @@ -29,7 +29,7 @@ LABEL description="This container builds and serves the FAM-wui app" RUN apk add --update bash jq netcat-openbsd curl && rm -rf /var/cache/apk/* ## Copy our default nginx config -COPY nginx/default.conf /etc/nginx/conf.d/ +COPY ./file-explorer/nginx/default.conf /etc/nginx/conf.d/ ## Remove default nginx website RUN rm -rf /usr/share/nginx/html/* diff --git a/file-explorer/package-lock.json b/file-explorer/package-lock.json index b63513f7..d14ce1bb 100644 --- a/file-explorer/package-lock.json +++ b/file-explorer/package-lock.json @@ -1,12 +1,12 @@ { "name": "file-explorer", - "version": "0.0.0", + "version": "0.3.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "file-explorer", - "version": "0.0.0", + "version": "0.3.2", "hasInstallScript": true, "dependencies": { "@ngx-translate/core": "^14.0.0", diff --git a/file-explorer/package.json b/file-explorer/package.json index 52c36d23..8e24b139 100644 --- a/file-explorer/package.json +++ b/file-explorer/package.json @@ -1,6 +1,6 @@ { "name": "file-explorer", - "version": "0.0.0", + "version": "0.3.2", "scripts": { "ng": "ng", "start": "ng serve", @@ -72,4 +72,4 @@ "traverse": "0.6.8" } } -} \ No newline at end of file +} diff --git a/release/release.sh b/release/release.sh index bef20b8f..a60d66c5 100755 --- a/release/release.sh +++ b/release/release.sh @@ -3,6 +3,12 @@ VERSION=$1 echo "Build and releas the image with version ${VERSION}" +prepare_arlas_fam_wui (){ + cd file-explorer + npm --no-git-tag-version version ${VERSION} + cd ../ +} + build_and_publish_docker (){ IMAGE=$1 echo "Building the image $IMAGE" @@ -18,6 +24,10 @@ build_and_publish_docker (){ build_and_publish_docker fam +#--------------- FAM WUI ---------------- +prepare_arlas_fam_wui +build_and_publish_docker arlas-fam-wui + #--------------- APROC ---------------- build_and_publish_docker aproc-proc @@ -40,6 +50,9 @@ python3 airs/core/models/utils.py > docs/model/model.schema.json jsonschema2md -d docs/model/ -o docs/model/ ./release/publish.sh $VERSION +# FILE EXPLORER +git add file-explorer/package.json +git add file-explorer/package-lock.json # DOCUMENTATION git add docs/ git commit -m "update docs for version "$VERSION