Merge remote-tracking branch 'origin/main' into dc3e4-new-matrix-field

Author: madassdev

.dockerignore

@@ -1,3 +1,4 @@
 /.git
 /Dockerfile
 /data
+\.env

.env.docker

@@ -2,32 +2,19 @@ APP_NAME="OpnForm"
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=false
-APP_LOG_LEVEL=debug
 APP_URL=http://localhost
 
 LOG_CHANNEL=errorlog
 LOG_LEVEL=debug
 
-DB_CONNECTION=pgsql
-DB_HOST=127.0.0.1
-DB_PORT=5432
-DB_DATABASE=postgres
-DB_USERNAME=postgres
-DB_PASSWORD=postgres
-
-FILESYSTEM_DRIVER=s3
-FILESYSTEM_DISK=s3
+FILESYSTEM_DRIVER=local
 
 BROADCAST_CONNECTION=log
 CACHE_STORE=redis
 QUEUE_CONNECTION=redis
-SESSION_DRIVER=file
+SESSION_DRIVER=redis
 SESSION_LIFETIME=120
 
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
 MAIL_MAILER=log
 MAIL_HOST=
 MAIL_PORT=
@@ -57,3 +44,4 @@ MUX_WORKSPACE_ID=
 MUX_API_TOKEN=
 
 OPEN_AI_API_KEY=
+SELF_HOSTED=true

.github/workflows/dockerhub.yml

@@ -11,16 +11,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Get tag name
-        run: ( echo "TAG_NAME=${GITHUB_REF#refs/*/v}"; echo "DOCKER_REPO=${{secrets.DOCKER_REPO}}") >> $GITHUB_ENV
+        run: |
+          (
+            echo "TAG_NAME=${GITHUB_REF#refs/*/v}";
+            echo "DOCKER_UI_REPO=${{secrets.DOCKER_UI_REPO}}"
+            echo "DOCKER_API_REPO=${{secrets.DOCKER_API_REPO}}"
+          ) >> $GITHUB_ENV
 
       - name: Check out the repo
         uses: actions/checkout@v3
 
       - name: Log in to Docker Hub
         run: docker login -u "${{ secrets.DOCKER_USERNAME }}" -p "${{ secrets.DOCKER_ACCESS_TOKEN }}"
-      
-      - name: Build docker image
-        run: docker build . -t $DOCKER_REPO:latest -t $DOCKER_REPO:$TAG_NAME
-      
-      - name: Push Docker image
-        run: docker push $DOCKER_REPO:latest && docker push $DOCKER_REPO:$TAG_NAME
+
+      - name: Build docker api image
+        run: docker build -f docker/Dockerfile.api . -t $DOCKER_API_REPO:latest -t $DOCKER_API_REPO:$TAG_NAME
+
+      - name: Build docker ui image
+        run: docker build -f docker/Dockerfile.client . -t $DOCKER_UI_REPO:latest -t $DOCKER_UI_REPO:$TAG_NAME
+
+      - name: Push Docker api image
+        run: docker push $DOCKER_API_REPO:latest && docker push $DOCKER_API_REPO:$TAG_NAME
+
+      - name: Push Docker ui image
+        run: docker push $DOCKER_UI_REPO:latest && docker push $DOCKER_UI_REPO:$TAG_NAME

.gitignore

@@ -29,5 +29,5 @@ public/.DS_Store
 .env.production
 .env.staging
 _ide_helper.php
-
+docker-compose.override.yml
 /.make.*