Merge pull request #138 from wetfish/main

Update staging from main
wetfish · Jul 13, 2023 · 93ef71f · 93ef71f
2 parents f2cb547 + cc0f158
commit 93ef71f
Show file tree

Hide file tree

Showing 1,151 changed files with 81,893 additions and 13 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -3,4 +3,6 @@ mariadb.env
 
 *.env
 
-db/data
+db/data/*
+
+storage/*
diff --git a/.github/workflows/docker-autobuild-nginx.yml b/.github/workflows/docker-autobuild-nginx.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - release
 
   # allow manual execution
   workflow_dispatch:
@@ -40,14 +41,16 @@ jobs:
           #          <pr #>-${{ env.COMPONENT }}
           #          <hash>-${{ env.COMPONENT }}
           #          <git tag>-${{ env.COMPONENT }}
-          #          prod-${{ env.COMPONENT }}    IF branch == main
+          #          prod-${{ env.COMPONENT }}    IF branch == release
+          #          staging-${{ env.COMPONET }}  IF branch == main
           tags: |
             type=ref,event=branch,suffix=-${{ env.COMPONENT }}
             type=ref,event=tag,suffix=-${{ env.COMPONENT }}
             type=ref,event=pr,suffix=-${{ env.COMPONENT }}
             type=sha,format=long,suffix=-${{ env.COMPONENT }}
             type=raw,value=latest,suffix=-${{ env.COMPONENT }},priority=900,enable={{is_default_branch}}
-            type=raw,value=prod,suffix=-${{ env.COMPONENT }},priority=1000,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=staging,suffix=-${{ env.COMPONENT }},priority=1000,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=prod,suffix=-${{ env.COMPONENT }},priority=1000,enable=${{ github.ref == format('refs/heads/{0}', 'release') }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v3

diff --git a/.github/workflows/docker-autobuild-php.yml b/.github/workflows/docker-autobuild-php.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - release
 
   # allow manual execution
   workflow_dispatch:
@@ -40,14 +41,16 @@ jobs:
           #          <pr #>-${{ env.COMPONENT }}
           #          <hash>-${{ env.COMPONENT }}
           #          <git tag>-${{ env.COMPONENT }}
-          #          prod-${{ env.COMPONENT }}    IF branch == main
+          #          prod-${{ env.COMPONENT }}    IF branch == release
+          #          staging-${{ env.COMPONET }}  IF branch == main
           tags: |
             type=ref,event=branch,suffix=-${{ env.COMPONENT }}
             type=ref,event=tag,suffix=-${{ env.COMPONENT }}
             type=ref,event=pr,suffix=-${{ env.COMPONENT }}
             type=sha,format=long,suffix=-${{ env.COMPONENT }}
             type=raw,value=latest,suffix=-${{ env.COMPONENT }},priority=900,enable={{is_default_branch}}
-            type=raw,value=prod,suffix=-${{ env.COMPONENT }},priority=1000,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=staging,suffix=-${{ env.COMPONENT }},priority=1000,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=prod,suffix=-${{ env.COMPONENT }},priority=1000,enable=${{ github.ref == format('refs/heads/{0}', 'release') }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v3

diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,10 @@ storage/fish/img/items/*
 storage/fish/bodies/*
 storage/fish/equipment/*
 
+storage/cache/*
+!storage/cache/.htaccess
+!storage/cache/index.php
+
 # Don't ignore default items
 !storage/fish/img/items/GoldfishGold_5eb501c16fdf0*.png
 !storage/fish/img/items/ProlapsePink_5eb501cb56418*.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,6 @@ mariadb.env @@
     *.env
-    db/data
+    db/data/*
+    storage/*