Dmitry Titov 3 years ago
parent 736f73d058
commit 38a498d9b2

@ -24,9 +24,7 @@ build-job:
stage: build stage: build
before_script: before_script:
- sudo docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY - sudo docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY
- sudo git fetch - ls
- sudo git reset --hard origin/sst_main
- sudo git submodule foreach git pull origin sst_main
script: script:
- sudo docker pull $IMAGE_NAME:latest || true - sudo docker pull $IMAGE_NAME:latest || true
- sudo docker build --cache-from $IMAGE_NAME:latest --tag $IMAGE_NAME:$CI_COMMIT_SHORT_SHA --tag $IMAGE_NAME:latest . - sudo docker build --cache-from $IMAGE_NAME:latest --tag $IMAGE_NAME:$CI_COMMIT_SHORT_SHA --tag $IMAGE_NAME:latest .
@ -58,7 +56,7 @@ deploy-test-job:
REMOTE_USER: $REMOTE_USER_TEST REMOTE_USER: $REMOTE_USER_TEST
COMPOSE: docker-compose.test.yml COMPOSE: docker-compose.test.yml
rules: rules:
- if: $CI_COMMIT_BRANCH == 'sst_main' - if: $CI_COMMIT_BRANCH == 'ssst_main'
pylint: pylint:
<<: *use_cached_requirements <<: *use_cached_requirements

@ -9,8 +9,8 @@ RUN mkdir /code
WORKDIR /code WORKDIR /code
ADD requirements.txt /code/ COPY requirements.txt /code/
RUN pip install -r requirements.txt RUN pip install -r requirements.txt
ADD . /code/ COPY . /code/

Loading…
Cancel
Save