docker-compose.yml

@@ -1,52 +1,47 @@
 version: "2.1"
 services:
-  postgres:
-    image: postgres:latest
-    environment:
-      - POSTGRES_USER=drone
-      - POSTGRES_PASSWORD
-      - POSTGRES_DB=dronedb
-    volumes:
-      - ./data/postgres:/var/lib/postgresql/data/
-    restart: always
-    healthcheck:
-      test: pg_isready -U drone -d dronedb
-      interval: 10s
-      timeout: 5s
-      retries: 5
+    postgres:
+        image: postgres:latest
+        environment:
+            - POSTGRES_USER=drone
+            - POSTGRES_PASSWORD
+            - POSTGRES_DB=dronedb
+        volumes:
+            - ./data/postgres:/var/lib/postgresql/data/
+        restart: always
 
-  server:
-    image: drone/drone:latest
-    environment:
-      - DRONE_GITEA_SERVER=https://git.boba.best
-      - DRONE_GITEA_CLIENT_ID
-      - DRONE_GITEA_CLIENT_SECRET
-      - DRONE_RPC_SECRET
-      - DRONE_SERVER_HOST=drone.boba.best
-      - DRONE_SERVER_PROTO=https
-      - DRONE_GIT_ALWAYS_AUTH=true
-      - DRONE_LOGS_TEXT=true
-      - DRONE_LOGS_PRETTY=true
-      - DRONE_LOGS_COLOR=true
-      - DRONE_DATABASE_DRIVER=postgres
-      - DRONE_DATABASE_DATASOURCE=postgres://drone:${POSTGRES_PASSWORD}@postgres:5432/dronedb?sslmode=disable
-      - DRONE_USER_CREATE=username:bbaovanc,admin:true
-    restart: always
-    ports:
-      - 127.0.0.1:8081:80
-    depends_on:
-      - postgres
+    server:
+        image: drone/drone:latest
+        environment:
+            - DRONE_GITEA_SERVER=https://git.boba.best
+            - DRONE_GITEA_CLIENT_ID
+            - DRONE_GITEA_CLIENT_SECRET
+            - DRONE_RPC_SECRET
+            - DRONE_SERVER_HOST=drone.boba.best
+            - DRONE_SERVER_PROTO=https
+            - DRONE_GIT_ALWAYS_AUTH=true
+            - DRONE_LOGS_TEXT=true
+            - DRONE_LOGS_PRETTY=true
+            - DRONE_LOGS_COLOR=true
+            - DRONE_DATABASE_DRIVER=postgres
+            - DRONE_DATABASE_DATASOURCE=postgres://drone:${POSTGRES_PASSWORD}@postgres:5432/dronedb?sslmode=disable
+            - DRONE_USER_CREATE=username:bbaovanc,admin:true
+        restart: always
+        ports:
+            - 127.0.0.1:8081:80
+        depends_on:
+            - postgres
 
-  runner:
-    image: drone/drone-runner-docker:latest
-    environment:
-      - DRONE_RPC_PROTO=https
-      - DRONE_RPC_HOST=drone.boba.best
-      - DRONE_RPC_SECRET
-      - DRONE_RUNNER_CAPACITY=4
-      - DRONE_RUNNER_NAME=hetzboba
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    restart: always
-    depends_on:
-      - server
+    runner:
+        image: drone/drone-runner-docker:latest
+        environment:
+            - DRONE_RPC_PROTO=https
+            - DRONE_RPC_HOST=drone.boba.best
+            - DRONE_RPC_SECRET
+            - DRONE_RUNNER_CAPACITY=4
+            - DRONE_RUNNER_NAME=hetzboba
+        volumes:
+            - /var/run/docker.sock:/var/run/docker.sock
+        restart: always
+        depends_on:
+            - server