Loading .gitlab-ci.yml +3 −4 Original line number Original line Diff line number Diff line Loading @@ -9,14 +9,14 @@ services: - docker:20.10-dind - docker:20.10-dind python: python: image: $CI_REGISTRY_IMAGE:master image: $CI_REGISTRY_IMAGE/env:latest stage: check stage: check script: script: - ./manage test.black - ./manage test.black - ./manage test.pylint - ./manage test.pylint build:web: build:web: image: $CI_REGISTRY_IMAGE:master image: $CI_REGISTRY_IMAGE/env:latest stage: build stage: build script: script: - ./manage node.env - ./manage node.env Loading Loading @@ -48,7 +48,7 @@ build:docker:tags: - tags - tags test:unit: test:unit: image: $CI_REGISTRY_IMAGE:master image: $CI_REGISTRY_IMAGE/env:latest stage: test stage: test script: script: - ./manage test.coverage - ./manage test.coverage Loading @@ -66,7 +66,6 @@ test:unit: - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub - ssh $DOCKER_HOST "cd $PATH_STAGING" - ssh $DOCKER_HOST "cd $PATH_STAGING" - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker pull $CI_REGISTRY_IMAGE/env script: script: - echo "Deploying to ($SSH_USER@$BACKEND_HOST)" - echo "Deploying to ($SSH_USER@$BACKEND_HOST)" - ssh $SSH_USER@$BACKEND_HOST "cd $DEPLOYMENT_PATH && git stash && git pull && git checkout $BRANCH && rm .env .env.prod && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" - ssh $SSH_USER@$BACKEND_HOST "cd $DEPLOYMENT_PATH && git stash && git pull && git checkout $BRANCH && rm .env .env.prod && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" Loading Loading
.gitlab-ci.yml +3 −4 Original line number Original line Diff line number Diff line Loading @@ -9,14 +9,14 @@ services: - docker:20.10-dind - docker:20.10-dind python: python: image: $CI_REGISTRY_IMAGE:master image: $CI_REGISTRY_IMAGE/env:latest stage: check stage: check script: script: - ./manage test.black - ./manage test.black - ./manage test.pylint - ./manage test.pylint build:web: build:web: image: $CI_REGISTRY_IMAGE:master image: $CI_REGISTRY_IMAGE/env:latest stage: build stage: build script: script: - ./manage node.env - ./manage node.env Loading Loading @@ -48,7 +48,7 @@ build:docker:tags: - tags - tags test:unit: test:unit: image: $CI_REGISTRY_IMAGE:master image: $CI_REGISTRY_IMAGE/env:latest stage: test stage: test script: script: - ./manage test.coverage - ./manage test.coverage Loading @@ -66,7 +66,6 @@ test:unit: - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub - ssh $DOCKER_HOST "cd $PATH_STAGING" - ssh $DOCKER_HOST "cd $PATH_STAGING" - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker pull $CI_REGISTRY_IMAGE/env script: script: - echo "Deploying to ($SSH_USER@$BACKEND_HOST)" - echo "Deploying to ($SSH_USER@$BACKEND_HOST)" - ssh $SSH_USER@$BACKEND_HOST "cd $DEPLOYMENT_PATH && git stash && git pull && git checkout $BRANCH && rm .env .env.prod && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" - ssh $SSH_USER@$BACKEND_HOST "cd $DEPLOYMENT_PATH && git stash && git pull && git checkout $BRANCH && rm .env .env.prod && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" Loading