Update .gitlab-ci.yml file

.gitlab-ci.yml

@@ -6,7 +6,8 @@ before_script:
     - curl https://code.ornl.gov/rse-deployment/rse-sharables/raw/master/rse-bash-modules.sh -O
     - source rse-bash-modules.sh
     #- func_rse_docker_cleanup
-    - docker login --username=$CI_REGISTRY_USER --password=$CI_REGISTRY_PASSWORD $CI_REGISTRY
+    #- docker login --username=$CI_REGISTRY_USER --password=$CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker login -u "$HARBOR_USERNAME" -p "$HARBOR_PASSWORD" "$HARBOR_URL"
 
 #after_script:
 #    - sudo chown -R gitlab-runner:gitlab-runner .
@@ -20,7 +21,8 @@ docker-build:
     - echo "SLACK_APP_TOKEN=$SLACK_APP_TOKEN" >> .env
     - echo "SLACK_BOT_TOKEN=$SLACK_BOT_TOKEN" >> .env
     - echo "GITHUB_TOKEN=$GITHUB_TOKEN" >> .env
-    - docker build -t code.ornl.gov:4567/sns-hfir-scse/infrastructure/amaterasu .
+    #- docker build -t code.ornl.gov:4567/sns-hfir-scse/infrastructure/amaterasu .
+    - docker build -t "$HARBOR_HOST/$HARBOR_PROJECT/amaterasu:latest" .
     #- func_rse_docker_cleanup
   tags:
     - neutrons
@@ -30,12 +32,14 @@ docker-deploy:
   script:
     - IMAGE_NAME="amaterasu"
     # - docker push ${IMAGE_NAME}
-    - docker push code.ornl.gov:4567/sns-hfir-scse/infrastructure/amaterasu
+    #- docker push code.ornl.gov:4567/sns-hfir-scse/infrastructure/amaterasu
+    - docker push "$HARBOR_HOST/$HARBOR_PROJECT/amaterasu:latest"
     # stop and remove the old running container
     - docker stop amaterasu || true
     - docker container rm amaterasu || true
     # start the service
-    - docker run -d --name amaterasu code.ornl.gov:4567/sns-hfir-scse/infrastructure/amaterasu
+    #- docker run -d --name amaterasu code.ornl.gov:4567/sns-hfir-scse/infrastructure/amaterasu
+    - docker run -d --name amaterasu "$HARBOR_HOST/$HARBOR_PROJECT/amaterasu:latest"
     #- func_rse_docker_cleanup
   only:
     - main