merge main

.gitlab-ci.yml

@@ -1,23 +1,26 @@
 stages:
   - build
   - deploy
- 
+
-build-dev:
+build-prod:
   stage: build
   when: on_success
   only:
     - main
     - dev-landing-v2
-  image:
+    - prod
+  image: 
     name: docker:25.0.3-cli
   services:
     - name: docker:25.0.3-dind
       command: ["--insecure-registry=38.47.185.86:8900"]
   script:
     - docker logout
-    - docker login -u $DEPLOY_USERNAME -p $DEPLOY_TOKEN 38.47.185.86:8900
+    - echo "Username:$DEPLOY_USERNAME"
-    - docker build -t 38.47.185.86:8900/mediahub/new-mediahub-fe:dev .
+    - echo "Token:$DEPLOY_TOKEN"
-    - docker push 38.47.185.86:8900/mediahub/new-mediahub-fe:dev
+    - echo "$DEPLOY_TOKEN" | docker login 38.47.185.86:8900 --username "$DEPLOY_USERNAME" --password-stdin
+    - docker build --no-cache -t 38.47.185.86:8900/mediahub/new-mediahub-fe:prod .
+    - docker push 38.47.185.86:8900/mediahub/new-mediahub-fe:prod
 
 auto-deploy:
   stage: deploy
@@ -26,5 +29,7 @@ auto-deploy:
     - main
     - dev-landing-v2
   image: curlimages/curl:latest
+  services:
+    - docker:dind
   script:
     - curl --user admin:$JENKINS_PWD http://38.47.185.86:8080/job/auto-deploy-new-mediahub-fe/build?token=autodeploynewmediahub