Merge branch 'CICD' into 'master'

Cicd

See merge request u5500327/wmgzon!1
This commit is contained in:
u5500327 2024-02-16 15:06:22 +00:00
commit 8d99fc5595
2 changed files with 32 additions and 3 deletions

View File

@ -2,10 +2,32 @@ variables:
APPSECRET: "test" APPSECRET: "test"
ENVIRON: "test" ENVIRON: "test"
FILESTORE: "static/assets/img/products/" FILESTORE: "static/assets/img/products/"
DOCKER_HOST: tcp://docker:2375/
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: ""
pytest: pytest:
stage: test stage: test
tags:
- python
script: script:
- cd /builds/u5500327/wmgzon - cd /builds/u5500327/wmgzon
- pip install -r requirements.txt - pip install -r requirements.txt
- pytest - pytest
deploy:
stage: deploy
tags:
- docker
image: docker:20.10.16
services:
- name: docker:20.10.16-dind
alias: docker
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA .
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
- docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA $CI_REGISTRY_IMAGE:latest
- docker push $CI_REGISTRY_IMAGE:latest
only:
- master

View File

@ -1,8 +1,15 @@
version: '3.8' version: '3.8'
services: services:
gitlab-runner: gitlab-runner-python:
image: gitlab/gitlab-runner:latest image: gitlab/gitlab-runner:latest
volumes: volumes:
- ./runner-data:/etc/gitlab-runner - ./runner-data-python:/etc/gitlab-runner
- /var/run/docker.sock:/var/run/docker.sock
restart: unless-stopped
gitlab-runner-docker:
image: gitlab/gitlab-runner:latest
volumes:
- ./runner-data-docker:/etc/gitlab-runner
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
restart: unless-stopped restart: unless-stopped