diff --git a/.drone.yml b/.drone.yml index 4702a81..fd961dd 100644 --- a/.drone.yml +++ b/.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/pi-hole - - git pull - - make restart + - name: release + commands: + - cd /mnt/md0/infra/pi-hole + - git pull + - make restart trigger: - branch: - - master - event: - - push + branch: + - master + event: + - push ... diff --git a/docker-compose.yml b/docker-compose.yml index f8a338d..039372d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,29 +2,29 @@ version: "3" services: - pihole: - image: pihole/pihole:v5.7 - container_name: pihole - hostname: pihole - restart: always + pihole: + image: pihole/pihole:v5.7 + container_name: pihole + hostname: pihole + restart: always - volumes: - - ./etc/dnsmasq.d/:/etc/dnsmasq.d/ - - ./etc/pihole/:/etc/pihole/ - expose: - - "443" - ports: - - "53:53/tcp" - - "53:53/udp" - - "67:67/udp" - - "3006:80" - cap_add: - - NET_ADMIN - dns: - - 127.0.0.1 - - 1.1.1.1 + volumes: + - ./etc/dnsmasq.d/:/etc/dnsmasq.d/ + - ./etc/pihole/:/etc/pihole/ + expose: + - "443" + ports: + - "53:53/tcp" + - "53:53/udp" + - "67:67/udp" + - "3006:80" + cap_add: + - NET_ADMIN + dns: + - 127.0.0.1 + - 1.1.1.1 - environment: - - TZ=Europe/Moscow - - ServerIP=192.168.1.49 + environment: + - TZ=Europe/Moscow + - ServerIP=192.168.1.49 ...