upgrade pullpreview compose file to v3 (opf#9029)

sdaro · Feb 19, 2021 · d0515f3 · d0515f3
1 parent cd371fe
commit d0515f3
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 34 deletions.
diff --git a/.github/workflows/pullpreview.yml b/.github/workflows/pullpreview.yml
@@ -26,12 +26,14 @@ jobs:
       run: |
         cp ./docker/pullpreview/docker-compose.yml ./docker-compose.pullpreview.yml
         cp ./docker/prod/Dockerfile ./Dockerfile
-    - uses: pullpreview/action@v4
+    - uses: pullpreview/action@v5
       with:
         admins: crohr,HDinger,machisuji,oliverguenther,ulferts,wielinde,b12f
         always_on: dev
         compose_files: docker-compose.pullpreview.yml
         instance_type: medium_2_0
+        ports: 80,443
+        default_port: 443
       env:
         AWS_ACCESS_KEY_ID: "${{ secrets.AWS_ACCESS_KEY_ID }}"
         AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}"

diff --git a/docker/pullpreview/docker-compose.yml b/docker/pullpreview/docker-compose.yml
@@ -1,40 +1,72 @@
-db:
-  image: postgres:10
-  environment:
-    POSTGRES_USER: app
-    POSTGRES_PASSWORD: p4ssw0rd
-    POSTGRES_DB: app
-  volumes:
-    - /var/lib/postgresql/data
-  expose:
-    - '5432'
+version: '3.7'
+networks:
+  frontend:
+    attachable: true
+  backend:
+    attachable: true
 
-web:
-  build: .
-  links:
-    - db
-  environment:
-    - "RAILS_CACHE_STORE=file_store"
-    - "DATABASE_URL=postgresql://app:p4ssw0rd@db:5432/app?encoding=utf8&pool=5&timeout=5000&reconnect=true"
-    - "SECRET_KEY_BASE=d4e74f017910ac56c6ebad01165b7e1b37f4c9c02e9716836f8670cdc8d65a231e64e4f6416b19c8"
-    - "RAILS_ENV=production"
-  env_file: ./.env.pullpreview
-  ports:
-    - "80:8080"
-  command: "./docker/prod/web"
-  volumes:
-    - "/var/openproject/assets"
+volumes:
+  caddy_data:
+  postgres_data:
+  openproject_data:
 
-worker:
-  build: .
-  links:
-    - db
+x-defaults: &defaults
+  build:
+    context: .
+  restart: unless-stopped
+  env_file:
+    - .env.pullpreview
+  volumes:
+    - "openproject_data:/var/openproject/assets"
   environment:
     - "RAILS_CACHE_STORE=file_store"
     - "DATABASE_URL=postgresql://app:p4ssw0rd@db:5432/app?encoding=utf8&pool=5&timeout=5000&reconnect=true"
     - "SECRET_KEY_BASE=d4e74f017910ac56c6ebad01165b7e1b37f4c9c02e9716836f8670cdc8d65a231e64e4f6416b19c8"
     - "RAILS_ENV=production"
-  env_file: ./.env.pullpreview
-  command: "./docker/prod/worker --seed --set attachment_max_size=262144,host_name=${PULLPREVIEW_PUBLIC_DNS}"
-  volumes_from:
-    - web
+  networks:
+    - backend
+
+
+services:
+  proxy:
+    image: caddy:2
+    restart: unless-stopped
+    command: "caddy reverse-proxy --from '${PULLPREVIEW_URL}' --to web:8080"
+    networks:
+      - frontend
+      - backend
+    depends_on:
+      - web
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - "caddy_data:/data"
+
+  db:
+    image: postgres:10
+    environment:
+      POSTGRES_USER: app
+      POSTGRES_PASSWORD: p4ssw0rd
+      POSTGRES_DB: app
+    networks:
+      - backend
+    volumes:
+      - "postgres_data:/var/lib/postgresql/data"
+    expose:
+      - "5432"
+
+  web:
+    <<: *defaults
+    expose:
+      - "8080"
+    command: "./docker/prod/web"
+    depends_on:
+      - db
+      - worker
+
+  worker:
+    <<: *defaults
+    command: "./docker/prod/worker --seed --set attachment_max_size=262144,host_name=${PULLPREVIEW_PUBLIC_DNS}"
+    depends_on:
+      - db