Skip to content
Snippets Groups Projects
Commit 8621ac72 authored by Tim Repke's avatar Tim Repke
Browse files

Merge branch 'server-deployment' into 'production'

pass gitlab ci token

See merge request !10
parents 7e6ee502 e9fd8b5f
No related branches found
No related tags found
1 merge request!10pass gitlab ci token
Pipeline #999 canceled
...@@ -52,7 +52,7 @@ deploy-to-production: ...@@ -52,7 +52,7 @@ deploy-to-production:
- bare-metal - bare-metal
script: script:
- echo "Run as nacsos user" - echo "Run as nacsos user"
- sudo -u nacsos bash ./deploy.sh - sudo -u nacsos bash ./deploy.sh $CI_JOB_TOKEN
# - echo "Current working directory" # - echo "Current working directory"
# - pwd # - pwd
# - echo "Current user" # - echo "Current user"
......
...@@ -19,7 +19,7 @@ echo "Dropping virtual environment" ...@@ -19,7 +19,7 @@ echo "Dropping virtual environment"
rm -rf venv rm -rf venv
echo "Fetching updated source" echo "Fetching updated source"
git config url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.pik-potsdam.de/".insteadOf "ssh://git@gitlab.pik-potsdam.de/" git config url."https://gitlab-ci-token:$1@gitlab.pik-potsdam.de/".insteadOf "ssh://git@gitlab.pik-potsdam.de/"
git stash # "reset" softly by stashing (in case files changed) git stash # "reset" softly by stashing (in case files changed)
git pull origin production # pull from origin (production branch) git pull origin production # pull from origin (production branch)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment