From 9cc080e83f3ce9622b61e9f8dd2c19e0f8dea71e Mon Sep 17 00:00:00 2001 From: Timo Date: Mon, 12 Jul 2021 20:21:24 +0300 Subject: [PATCH] Paligo theme: RED-1439 / RED-1800 --- bamboo-specs/src/main/java/buildjob/PlanSpec.java | 3 ++- bamboo-specs/src/main/resources/scripts/build.sh | 6 ++++++ docker/red-ui/Dockerfile | 8 ++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index 6bb744105..71eb180da 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -88,7 +88,8 @@ public class PlanSpec { new DockerConfiguration().image("nexus.iqser.com:5001/infra/release_build:2.9.1") .volume("/var/lib/docker", "/var/lib/docker") .volume("/var/run/docker.sock", "/var/run/docker.sock")) - .artifacts(new Artifact("version").location(".").copyPattern("**/version.properties").shared(true)); + .artifacts(new Artifact("version").location(".").copyPattern("**/version.properties").shared(true), + new Artifact("paligo-theme.zip").location(".").copyPattern("**/paligo-theme.zip").shared(true)); } diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index 4cf565bda..51f6f3b2c 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -31,6 +31,12 @@ then echo "Publishing Images with version $version" echo "$BAMBOO_DOWNLOAD_PASS" | docker login -u "$BAMBOO_DOWNLOAD_USER" --password-stdin nexus.iqser.com:5001 + # re-build intermediate build stage from layer cache, run image and get artifacts ( paligo theme ) + docker build --target builder -t builder-image:latest -f "$dockerfileLocation" . + mkdir -p /tmp/styles-export + docker run -v /tmp/styles-export:/tmp/styles-export builder-image:latest + zip -r ./paligo-theme.zip /tmp/styles-export + docker push "$imageName:latest" docker tag "$imageName:latest" "$imageName:$version" docker push "$imageName:$version" diff --git a/docker/red-ui/Dockerfile b/docker/red-ui/Dockerfile index db5c4e445..baec3fe5c 100644 --- a/docker/red-ui/Dockerfile +++ b/docker/red-ui/Dockerfile @@ -20,10 +20,14 @@ COPY nx.json nx.json COPY .eslintrc.json .eslintrc.json COPY tsconfig.base.json tsconfig.base.json COPY versions.sh version.sh +COPY paligo-styles paligo-styles ## Build the angular app in production mode and store the artifacts in dist folder -RUN yarn lint -RUN yarn build --configuration production --project=red-ui --base-href /ui/ +# RUN yarn lint +# RUN yarn build --configuration production --project=red-ui --base-href /ui/ +RUN yarn run build-paligo-styles +CMD ["/bin/cp", "-r", "/ng-app/dist/paligo-styles", "/tmp/styles-export"] + ### STAGE 2: Setup ###