From 0f4acddd0278c45fadd5ee52f7b8d6cee8d0c7f9 Mon Sep 17 00:00:00 2001 From: Julius Unverfehrt Date: Mon, 21 Feb 2022 16:32:38 +0100 Subject: [PATCH] Pull request #10: adjusted build scripts for repo rename Merge in RR/fb-detr from refactor-build to master Squashed commit of the following: commit 96d272ecfaf94b88ade5dd64fce662832ec44684 Author: Julius Unverfehrt Date: Mon Feb 21 16:31:31 2022 +0100 adjusted build scripts for repo rename --- Dockerfile | 2 +- bamboo-specs/src/main/java/buildjob/PlanSpec.java | 6 +++--- setup/docker.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3ff31f4..50a495f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG BASE_ROOT="nexus.iqser.com:5001/red/" ARG VERSION_TAG="latest" -FROM ${BASE_ROOT}fb_detr_prediction_container-base:${VERSION_TAG} +FROM ${BASE_ROOT}fb-detr-base:${VERSION_TAG} WORKDIR /app/service diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index 0857db7..090be4d 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -33,8 +33,8 @@ import com.atlassian.bamboo.specs.model.task.ScriptTaskProperties.Location; @BambooSpec public class PlanSpec { - private static final String SERVICE_NAME = "fb_detr_prediction_container"; - private static final String SERVICE_NAME_BASE = "fb_detr_prediction_container-base"; + private static final String SERVICE_NAME = "fb-detr"; + private static final String SERVICE_NAME_BASE = "fb-detr-base"; private static final String SERVICE_KEY = SERVICE_NAME.toUpperCase().replaceAll("-","").replaceAll("_",""); @@ -72,7 +72,7 @@ public class PlanSpec { return new Plan( project(), SERVICE_NAME, new BambooKey(SERVICE_KEY)) - .description("Docker build for fb_detr_prediction_container.") + .description("Docker build for fb-detr.") // .variables() .stages(new Stage("Build Stage") .jobs( diff --git a/setup/docker.sh b/setup/docker.sh index f6b670e..ae86dfd 100755 --- a/setup/docker.sh +++ b/setup/docker.sh @@ -11,5 +11,5 @@ dvc pull git submodule update --init --recursive -docker build -f Dockerfile_base -t fb_detr_prediction_container-base . -docker build -f Dockerfile -t detr-server . +docker build -f Dockerfile_base -t fb-detr-base . +docker build -f Dockerfile -t fb-detr .