Merge branch 'senpai' into dev

This commit is contained in:
Daniel Kluge 2021-12-15 00:09:44 +01:00
commit b99bdb366c
2 changed files with 4 additions and 3 deletions

View File

@ -64,7 +64,7 @@ steps:
commands:
- docker login -u $${DOCKER_USER} -p $${DOCKER_PASS}
- docker-compose -p website-dev -f docker-compose.dev.yml rm -s -v -f
- docker rmi $${IMAGE}
- docker rmi $${IMAGE} || true
- docker pull $${IMAGE}
- docker-compose -p website-dev -f docker-compose.dev.yml up --no-build -d
- name: deploy-stable
@ -76,9 +76,10 @@ steps:
from_secret: docker_user
DOCKER_PASS:
from_secret: docker_token
IMAGE: c0ntroller/c0ntroller.de:latest
commands:
- docker login -u $${DOCKER_USER} -p $${DOCKER_PASS}
- docker-compose -p website -f docker-compose.stable.yml rm -s -v -f
- docker rmi $${IMAGE}
- docker rmi $${IMAGE} || true
- docker pull $${IMAGE}
- docker-compose -p website -f docker-compose.stable.yml up --no-build -d

View File

@ -2,7 +2,7 @@ version: '3'
services:
server:
image: c0ntroller/c0ntroller.de:stable
image: c0ntroller/c0ntroller.de:latest
restart: always
networks:
- traefik