Browse Source

cleanup

pull/10/head
fedy95 4 years ago
parent
commit
be9152ec7d
  1. 46
      .drone.yml
  2. 44
      docker-compose.yml

46
.drone.yml

@ -3,15 +3,15 @@ kind: pipeline
type: docker
name: pull_request
image_pull_secrets:
- dockerconfigjson
- dockerconfigjson
steps:
- name: lint yaml
image: registry.fedy95.com/baseimage-yamllint:latest
commands:
- yamllint -c /yamllint/relaxed.yaml docker-compose.yml
when:
event: pull_request
- name: lint yaml
image: registry.fedy95.com/baseimage-yamllint:latest
commands:
- yamllint -c /yamllint/relaxed.yaml docker-compose.yml
when:
event: pull_request
---
kind: pipeline
@ -19,26 +19,26 @@ type: ssh
name: master_push
clone:
disable: true
disable: true
server:
host:
from_secret: host
user:
from_secret: user
password:
from_secret: password
host:
from_secret: host
user:
from_secret: user
password:
from_secret: password
steps:
- name: release
commands:
- cd /mnt/md0/infra/wiki
- git pull
- make restart
- name: release
commands:
- cd /mnt/md0/infra/wiki
- git pull
- make restart
trigger:
branch:
- master
event:
- push
branch:
- master
event:
- push
...

44
docker-compose.yml

@ -1,33 +1,33 @@
---
version: "3"
services:
wiki_db:
image: postgres:13-alpine
container_name: wiki_db
wiki_db:
image: postgres:13-alpine
container_name: wiki_db
hostname: wiki_db
restart: unless-stopped
hostname: wiki_db
restart: unless-stopped
logging:
driver: "none"
logging:
driver: "none"
env_file:
- ./.env-wiki_db
env_file:
- ./.env-wiki_db
volumes:
- ./etc/db-data:/var/lib/postgresql/data
wiki_instance:
image: requarks/wiki:2.5
container_name: wiki_instance
volumes:
- ./etc/db-data:/var/lib/postgresql/data
wiki_instance:
image: requarks/wiki:2.5
container_name: wiki_instance
hostname: wiki_instance
restart: unless-stopped
depends_on:
- wiki_db
hostname: wiki_instance
restart: unless-stopped
depends_on:
- wiki_db
env_file:
- ./.env-wiki_instance
env_file:
- ./.env-wiki_instance
ports:
- "3008:3000"
ports:
- "3008:3000"
...