From b805225e8770aeb95483cef070e796df9cf41bf6 Mon Sep 17 00:00:00 2001
From: Eric McDaniel <eric.g.mcdaniel@gmail.com>
Date: Tue, 4 Mar 2025 18:46:05 -0500
Subject: [PATCH] chore: PR preview fixes (#1021)

* chore: set log level=debug

* chore: try removing healthcheck

* chore: add healthcheck back

* chore: attach false maybe

* chore: really not sure

* chore: try removing minio-init

* chore: empty test commit
---
 .github/workflows/on_pr.yml  | 10 +++++++---
 docker-compose.preview.yml   | 13 +++++++------
 self-host/docker-compose.yml | 34 +++++++++++++++++-----------------
 3 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/on_pr.yml b/.github/workflows/on_pr.yml
index bb0e58520..730dbe0a7 100644
--- a/.github/workflows/on_pr.yml
+++ b/.github/workflows/on_pr.yml
@@ -36,7 +36,11 @@ jobs:
             AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
 
     deploy-preview:
-        permissions: write-all
+        permissions:
+            contents: read
+            deployments: write
+            pull-requests: write
+            statuses: write
         runs-on: ubuntu-latest
         timeout-minutes: 30
         needs:
@@ -71,13 +75,13 @@ jobs:
               with:
                   label: preview
                   admins: 3mcd
-                  cidrs: "0.0.0.0/0"
                   compose_files: ./self-host/docker-compose.yml,docker-compose.preview.yml
                   default_port: 443
                   instance_type: small
-                  ports: 443,9001
+                  ports: 80,443,9001
                   registries: docker://AWS:${{steps.ecrtoken.outputs.value}}@246372085946.dkr.ecr.us-east-1.amazonaws.com
               env:
                   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
                   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
                   AWS_REGION: ${{ env.AWS_REGION }}
+                  PULLPREVIEW_LOGGER_LEVEL: DEBUG
diff --git a/docker-compose.preview.yml b/docker-compose.preview.yml
index b5ea9b0cf..216926d31 100644
--- a/docker-compose.preview.yml
+++ b/docker-compose.preview.yml
@@ -10,12 +10,13 @@ services:
             ASSETS_UPLOAD_KEY: preview-different
             ASSETS_UPLOAD_SECRET_KEY: preview-different123
             ASSETS_STORAGE_ENDPOINT: https://${PULLPREVIEW_PUBLIC_DNS}/assets
-    minio-init:
-        environment:
-            MINIO_ROOT_USER: preview
-            MINIO_ROOT_PASSWORD: preview123
-            ASSETS_UPLOAD_KEY: preview-different
-            ASSETS_UPLOAD_SECRET_KEY: preview-different123
+    # minio-init:
+    #     restart: on-failure
+    #     environment:
+    #         MINIO_ROOT_USER: preview
+    #         MINIO_ROOT_PASSWORD: preview123
+    #         ASSETS_UPLOAD_KEY: preview-different
+    #         ASSETS_UPLOAD_SECRET_KEY: preview-different123
     minio:
         environment:
             MINIO_ROOT_USER: preview
diff --git a/self-host/docker-compose.yml b/self-host/docker-compose.yml
index e68b0aece..c2cec5c3b 100644
--- a/self-host/docker-compose.yml
+++ b/self-host/docker-compose.yml
@@ -110,23 +110,23 @@ services:
             - app-network
 
     # initialize minio
-    minio-init:
-        depends_on:
-            minio:
-                condition: service_healthy
-        image: minio/mc:latest
-        env_file: .env
-        entrypoint: >
-            /bin/sh -c '
-            /usr/bin/mc config host add myminio http://minio:9000 "$${MINIO_ROOT_USER}" "$${MINIO_ROOT_PASSWORD}";
-            /usr/bin/mc mb --ignore-existing myminio/"$${ASSETS_BUCKET_NAME}";
-            /usr/bin/mc anonymous set download myminio/"$${ASSETS_BUCKET_NAME}";
-            /usr/bin/mc admin user add myminio "$${ASSETS_UPLOAD_KEY}" "$${ASSETS_UPLOAD_SECRET_KEY}";
-            /usr/bin/mc admin policy attach myminio readwrite --user "$${ASSETS_UPLOAD_KEY}";
-            exit 0;
-            '
-        networks:
-            - app-network
+    # minio-init:
+    #     depends_on:
+    #         minio:
+    #             condition: service_healthy
+    #     image: minio/mc:latest
+    #     env_file: .env
+    #     entrypoint: >
+    #         /bin/sh -c '
+    #         /usr/bin/mc config host add myminio http://minio:9000 "$${MINIO_ROOT_USER}" "$${MINIO_ROOT_PASSWORD}";
+    #         /usr/bin/mc mb --ignore-existing myminio/"$${ASSETS_BUCKET_NAME}";
+    #         /usr/bin/mc anonymous set download myminio/"$${ASSETS_BUCKET_NAME}";
+    #         /usr/bin/mc admin user add myminio "$${ASSETS_UPLOAD_KEY}" "$${ASSETS_UPLOAD_SECRET_KEY}";
+    #         /usr/bin/mc admin policy attach myminio readwrite --user "$${ASSETS_UPLOAD_KEY}";
+    #         exit 0;
+    #         '
+    #     networks:
+    #         - app-network
 
 volumes:
     caddy-data: