Troubleshooting - Change the repository prefix to melodic/

.gitlab-ci.yml

@@ -4,7 +4,6 @@
 #  
 
 variables:
-  BRANCH_NAME: "rc3.0"
   DOCKER_PUSH: "true"
   DOCKER_REPO: "gitlab.ow2.org:4567"
   MAVEN_IMAGE: "maven:3.5.2-jdk-8"
@@ -16,8 +15,8 @@ variables:
   DOCKER_CLI: "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v $CI_PROJECT_DIR/maven_repo:/root/.m2 -w /usr/src/mymaven -v $CI_PROJECT_DIR:/usr/src/mymaven $MAVEN_IMAGE"
   RAML_TO_JAXRS_CLI: "mvn -DskipTests --batch-mode -f raml-to-jaxrs-7bulls/pom.xml"
   INTERFACES_CLI: "mvn -DskipTests --batch-mode -f interfaces/pom.xml"
-  #MULE_ESB_CLI: "mvn -DskipTests -Ddocker.repository=$DOCKER_REPO -Ddocker.push=$DOCKER_PUSH -Ddocker.imagePrefix=melodic-$BRANCH_NAME/ --batch-mode -f mule_esb/pom.xml"
-  #PROCESS_CLI: "mvn -DskipTests -Ddocker.repository=$DOCKER_REPO -Ddocker.push=$DOCKER_PUSH -Ddocker.imagePrefix=melodic-$BRANCH_NAME/ --batch-mode -f process/pom.xml"
+  #MULE_ESB_CLI: "mvn -DskipTests -Ddocker.repository=$DOCKER_REPO -Ddocker.push=$DOCKER_PUSH -Ddocker.imagePrefix=melodic/ --batch-mode -f mule_esb/pom.xml"
+  #PROCESS_CLI: "mvn -DskipTests -Ddocker.repository=$DOCKER_REPO -Ddocker.push=$DOCKER_PUSH -Ddocker.imagePrefix=melodic/ --batch-mode -f process/pom.xml"
   MULE_ESB_CLI: "mvn -DskipTests --batch-mode -f mule_esb/pom.xml"
   PROCESS_CLI: "mvn -DskipTests --batch-mode -f process/pom.xml"
   DOCKER_DRIVER: overlay
@@ -79,10 +78,10 @@ deploy:mule_esb:
   services:
     - $DOCKER_DIND_SERVICE
   script:
-    - $DOCKER_CLI $MULE_ESB_CLI -Ddocker.imagePrefix=melodic-$BRANCH_NAME/ clean install
+    - $DOCKER_CLI $MULE_ESB_CLI -Ddocker.imagePrefix=melodic/ clean install
     - echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $DOCKER_REPO -u $K8S_SECRET_DOCKER_USER --password-stdin 
-    - docker tag $LOCAL_REPO/melodic-$BRANCH_NAME/mule $DOCKER_REPO/melodic-$BRANCH_NAME/mule
-    - docker push $DOCKER_REPO/melodic-$BRANCH_NAME/mule:latest
+    - docker tag $LOCAL_REPO/melodic/mule $DOCKER_REPO/melodic/mule
+    - docker push $DOCKER_REPO/melodic/mule:latest
   only:
     - master
 
@@ -92,9 +91,9 @@ deploy:process:
   services:
     - $DOCKER_DIND_SERVICE
   script:    
-    - $DOCKER_CLI $PROCESS_CLI -Ddocker.imagePrefix=melodic-$BRANCH_NAME/ clean install
+    - $DOCKER_CLI $PROCESS_CLI -Ddocker.imagePrefix=melodic/ clean install
     - echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $DOCKER_REPO -u $K8S_SECRET_DOCKER_USER --password-stdin 
-    - docker tag $LOCAL_REPO/melodic-$BRANCH_NAME/process $DOCKER_REPO/melodic-$BRANCH_NAME/process
-    - docker push $DOCKER_REPO/melodic-$BRANCH_NAME/process
+    - docker tag $LOCAL_REPO/melodic/process $DOCKER_REPO/melodic/process
+    - docker push $DOCKER_REPO/melodic/process
   only:
     - master