Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-3800: update image url

Browse Source
This commit is contained in:
Dan Percic 2023-05-17 11:44:12 +03:00
parent 27ea01cff9
commit 1f1af16e0c
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bamboo-specs/src/main/java/buildjob/PlanSpec.java
View File

@ -95,7 +95,7 @@ public class PlanSpec {
// create tag with this version // create tag with this version
new VcsTagTask().tagName("${bamboo.inject.APP_VERSION}").repository("RED / ui") new VcsTagTask().tagName("${bamboo.inject.APP_VERSION}").repository("RED / ui")
).dockerConfiguration( ).dockerConfiguration(
new DockerConfiguration().image("nexus.iqser.com:5001/infra/release_build:4.2.0") new DockerConfiguration().image("nexus.knecon.com:5001/infra/release_build:4.2.0")
.volume("/var/run/docker.sock", "/var/run/docker.sock")) .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.tar.gz").location(".").copyPattern("**/paligo-theme.tar.gz").shared(true)); new Artifact("paligo-theme.tar.gz").location(".").copyPattern("**/paligo-theme.tar.gz").shared(true));
@ -119,10 +119,9 @@ public class PlanSpec {
new VcsBranchTask().branchName("release/${bamboo.inject.APP_VERSION}").repository("RED / ui")) new VcsBranchTask().branchName("release/${bamboo.inject.APP_VERSION}").repository("RED / ui"))
.dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/release_build:2.9.1") .dockerConfiguration(new DockerConfiguration().image("nexus.knecon.com:5001/infra/release_build:2.9.1")
.volume("/var/run/docker.sock", "/var/run/docker.sock")); .volume("/var/run/docker.sock", "/var/run/docker.sock"));
} }
} }

7
bamboo-specs/src/main/resources/scripts/build.sh
View File

@ -2,7 +2,7 @@
set -e set -e
imageName="nexus.iqser.com:5001/red/$PROJECT" imageName="nexus.knecon.com:5001/red/$PROJECT"
dockerfileLocation="docker/$PROJECT/Dockerfile" dockerfileLocation="docker/$PROJECT/Dockerfile"
echo "submodule status" echo "submodule status"
@ -33,7 +33,7 @@ then
echo "APP_VERSION=${version}" > version.properties echo "APP_VERSION=${version}" > version.properties
echo "Publishing Images with version $version" echo "Publishing Images with version $version"
echo "$BAMBOO_DOWNLOAD_PASS" | docker login -u "$BAMBOO_DOWNLOAD_USER" --password-stdin nexus.iqser.com:5001 echo "$BAMBOO_DOWNLOAD_PASS" | docker login -u "$BAMBOO_DOWNLOAD_USER" --password-stdin nexus.knecon.com:5001
# re-build intermediate build stage from layer cache, run image and get artifacts ( paligo theme ) # re-build intermediate build stage from layer cache, run image and get artifacts ( paligo theme )
docker build --build-arg bamboo_sonarqube_api_token_secret=${bamboo_sonarqube_api_token_secret} --target builder -t builder-image:latest -f "$dockerfileLocation" . docker build --build-arg bamboo_sonarqube_api_token_secret=${bamboo_sonarqube_api_token_secret} --target builder -t builder-image:latest -f "$dockerfileLocation" .
@ -51,7 +51,7 @@ else
if [[ ! -z "$bamboo_version_tag" ]] if [[ ! -z "$bamboo_version_tag" ]]
then then
echo "$BAMBOO_DOWNLOAD_PASS" | docker login -u "$BAMBOO_DOWNLOAD_USER" --password-stdin nexus.iqser.com:5001 echo "$BAMBOO_DOWNLOAD_PASS" | docker login -u "$BAMBOO_DOWNLOAD_USER" --password-stdin nexus.knecon.com:5001
echo "Pushing custom tag: $bamboo_version_tag" echo "Pushing custom tag: $bamboo_version_tag"
docker tag "$imageName:latest" "$imageName:$bamboo_version_tag" docker tag "$imageName:latest" "$imageName:$bamboo_version_tag"
docker push "$imageName:$bamboo_version_tag" docker push "$imageName:$bamboo_version_tag"
@ -59,4 +59,3 @@ else
fi fi