c0ntroller/frontpage
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Activity

Merge branch 'senpai' into dev

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.drone.yml
View File

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

2
docker-compose.stable.yml
View File

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