From 28582094e48bcf6e42434acd819fc8eb350211e4 Mon Sep 17 00:00:00 2001
From: nabilelmahiri <nabil.elmahiri@fractalite.com>
Date: Thu, 7 Mar 2019 12:23:24 +0100
Subject: [PATCH] npm login

---
 .gitlab-ci.yml | 72 ++++++++++++++++++++++++++++++++++++------------------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e655ba8..de7c85d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,43 +18,11 @@ stages:
   - build
   - deploy
 
-# build:
-#   stage: build
-#   environment: Production
-#   tags:
-#     - atlasvoyages-prod-runner
-#   only:
-#     - master
-#   script:
-#     # - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
-#     # # Run ssh-agent (inside the build environment)
-#     # - eval $(ssh-agent -s)
-#     # # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
-#     # - ssh-add <(echo "$SSH_PRIVATE_KEY_64" | base64 -d)
-#     # - mkdir -p ~/.ssh
-#     # - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
-#     - chmod +x sh/run.sh
-#     - docker build --build-arg SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY" --build-arg CI_JOB_TOKEN="${CI_JOB_TOKEN}" --build-arg DEPLOY_TOKEN="$DEPLOY_TOKEN" -f docker/Dockerfile -t atlasvoyages-docker:prod . 
-#     - sh sh/clean.sh
-
-# deploy:
-#   stage: deploy
-#   environment: Production
-#   tags:
-#     - atlasvoyages-prod-runner
-#   only:
-#     - master
-#   script:
-#     - chmod +x sh/run.sh
-#     - sh sh/run.sh
-#     - docker run -d -p 7778:80  --name atlasvoyages-docker-prod atlasvoyages-docker:prod
-#     - sh sh/clean.sh
-
 build:
   stage: build
   environment: Production
   tags:
-    - atlasvoyages-runner
+    - atlasvoyages-prod-runner
   only:
     - master
   script:
@@ -66,18 +34,50 @@ build:
     # - mkdir -p ~/.ssh
     # - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
     - chmod +x sh/run.sh
-    - docker build --build-arg SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY_TEST" --build-arg CI_JOB_TOKEN="${CI_JOB_TOKEN}"  -f docker/Dockerfile -t atlasvoyages-docker:prod . 
+    - docker build --build-arg SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY" --build-arg CI_JOB_TOKEN="${CI_JOB_TOKEN}" --build-arg DEPLOY_TOKEN="$DEPLOY_TOKEN" -f docker/Dockerfile -t atlasvoyages-docker:prod . 
     - sh sh/clean.sh
 
 deploy:
   stage: deploy
   environment: Production
   tags:
-    - atlasvoyages-runner
+    - atlasvoyages-prod-runner
   only:
     - master
   script:
     - chmod +x sh/run.sh
     - sh sh/run.sh
     - docker run -d -p 7778:80  --name atlasvoyages-docker-prod atlasvoyages-docker:prod
-    - sh sh/clean.sh
\ No newline at end of file
+    - sh sh/clean.sh
+
+# build:
+#   stage: build
+#   environment: Production
+#   tags:
+#     - atlasvoyages-runner
+#   only:
+#     - master
+#   script:
+#     # - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+#     # # Run ssh-agent (inside the build environment)
+#     # - eval $(ssh-agent -s)
+#     # # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
+#     # - ssh-add <(echo "$SSH_PRIVATE_KEY_64" | base64 -d)
+#     # - mkdir -p ~/.ssh
+#     # - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+#     - chmod +x sh/run.sh
+#     - docker build --build-arg SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY_TEST" --build-arg CI_JOB_TOKEN="${CI_JOB_TOKEN}"  -f docker/Dockerfile -t atlasvoyages-docker:prod . 
+#     - sh sh/clean.sh
+
+# deploy:
+#   stage: deploy
+#   environment: Production
+#   tags:
+#     - atlasvoyages-runner
+#   only:
+#     - master
+#   script:
+#     - chmod +x sh/run.sh
+#     - sh sh/run.sh
+#     - docker run -d -p 7778:80  --name atlasvoyages-docker-prod atlasvoyages-docker:prod
+#     - sh sh/clean.sh
\ No newline at end of file
--
libgit2 0.26.0