Merge 24c8e49 into 21feb38

Author: katzterd

.env-dist

@@ -22,9 +22,6 @@ COLOR_THEMES=normal|omsk
 # Moderation password of common room
 COMMON_ROOM_CONTROLWORD=
 
-# Endpoint for all gates
-#GATE_ENDPOINT_HOST=onechan
-
 # Uncomment to enable torgate
 #TORGATE_HOSTNAME=yourhost.onion
 #TORGATE_PUBLIC_KEY=ed25519_public_key_in_base64

.github/workflows/docker-build.yml

@@ -29,21 +29,13 @@ jobs:
         with:
           files_yaml: |
             onechan:
-              - 'app/**'
-              - 'resources/**'
-              - 'scripts/**'
-              - 'www/**'
-              - 'docker/1chan.Dockerfile'
-              - 'docker/config/1chan/*'
+              - 'frontend/**'
             torgate:
-              - 'docker/torgate.Dockerfile'
-              - 'docker/config/torgate/*'
+              - 'torgate/**'
             i2pgate:
-              - 'docker/i2pgate.Dockerfile'
-              - 'docker/config/i2pgate/*'
+              - 'i2pgate/**'
             yggdrasilgate:
-              - 'docker/yggdrasil.Dockerfile'
-              - 'docker/config/yggdrasil/*'
+              - 'yggdrasil/**'
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -59,8 +51,8 @@ jobs:
         uses: docker/build-push-action@v5
         if: steps.filter.outputs.onechan_any_changed == 'true'
         with:
-          context: .
-          file: docker/1chan.Dockerfile
+          context: frontend/.
+          file: frontend/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ghcr.io/${{ github.repository }}/${{ env.ONECHAN_IMAGE_NAME }}:latest
@@ -72,8 +64,8 @@ jobs:
         uses: docker/build-push-action@v5
         if: steps.filter.outputs.torgate_any_changed == 'true'
         with:
-          context: .
-          file: docker/torgate.Dockerfile
+          context: torgate/.
+          file: torgate/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ghcr.io/${{ github.repository }}/${{ env.TORGATE_IMAGE_NAME }}:latest
@@ -85,8 +77,8 @@ jobs:
         uses: docker/build-push-action@v5
         if: steps.filter.outputs.i2pgate_any_changed == 'true'
         with:
-          context: .
-          file: docker/i2pgate.Dockerfile
+          context: i2pgate/.
+          file: i2pgate/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ghcr.io/${{ github.repository }}/${{ env.I2PGATE_IMAGE_NAME }}:latest
@@ -98,8 +90,8 @@ jobs:
         uses: docker/build-push-action@v5
         if: steps.filter.outputs.yggdrasilgate_any_changed == 'true'
         with:
-          context: .
-          file: docker/yggdrasil.Dockerfile
+          context: yggdrasil/.
+          file: yggdrasil/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ghcr.io/${{ github.repository }}/${{ env.YGGDRASILGATE_IMAGE_NAME }}:latest

.github/workflows/helm-build.yml

@@ -4,40 +4,28 @@ on:
   pull_request:
     branches:
       - master
-    
-permissions: {}
-jobs:
 
-  diff:
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: read
-    outputs:
-      buildHelm: ${{ steps.diff.outputs.buildHelm_any_changed }}
-    steps:
-    - uses: tj-actions/changed-files@v46.0.5
-      id: diff
-      with:
-        files_yaml: |
-          buildHelm:
-            - 'k8s/helm/**'
-            - '.cr.yaml'
+jobs:
 
   buildHelm:
     permissions:
       contents: write # to push chart release and create a release (helm/chart-releaser-action)
       packages: write # needed for ghcr access
     runs-on: ubuntu-latest
-    needs: diff
-    if: needs.diff.outputs.buildHelm == 'true'
     steps:
-    
-# Prepare
+
       - 
         name: Checkout
         uses: actions/checkout@v4
+      -
+        name: Filter
+        uses: tj-actions/changed-files@v46.0.5
+        id: filter
         with:
-          fetch-depth: 0
+          files_yaml: |
+            buildHelm:
+              - 'k8s/helm/**'
+              - '.cr.yaml'
       - 
         name: Configure Git
         run: |
@@ -48,11 +36,10 @@ jobs:
         uses: azure/setup-helm@v4
         with:
           version: v3.12.0
-          
-# Build
       - 
         name: Run chart-releaser
         uses: helm/chart-releaser-action@v1.5.0
+        if: steps.filter.outputs.buildHelm_any_changed == 'true'
         with:
           charts_dir: k8s/helm/charts
           config: k8s/.cr.yaml
@@ -62,12 +49,14 @@ jobs:
       - 
         name: Login to ghcr
         uses: docker/login-action@v3.0.0
+        if: steps.filter.outputs.buildHelm_any_changed == 'true'
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - 
         name: Push charts to ghcr
+        if: steps.filter.outputs.buildHelm_any_changed == 'true'
         run: |
           shopt -s nullglob
           for pkg in .cr-release-packages/*.tgz; do

.gitignore

@@ -1,10 +1,9 @@
-*
-!app
-!docker
+/*
+!frontend
+!i2pgate
 !k8s
-!resources
-!scripts
-!www
+!torgate
+!yggdrasil
 !.github
 !docker-compose.yaml
 !LICENSE

README.md

@@ -16,9 +16,7 @@ services:
       - 1chan
 
   onechan:
-    build:
-      context: .
-      dockerfile: ./docker/1chan.Dockerfile
+    build: ./frontend
     container_name: onechan
     restart: always
     env_file:
@@ -57,9 +55,7 @@ services:
       - redis
 
   torgate:
-    build:
-      context: .
-      dockerfile: ./docker/torgate.Dockerfile
+    build: ./torgate
     container_name: torgate
     depends_on:
       onechan:
@@ -71,9 +67,7 @@ services:
       - 1chan
 
   i2pgate:
-    build:
-      context: .
-      dockerfile: ./docker/i2pgate.Dockerfile
+    build: ./i2pgate
     container_name: i2pgate
     depends_on:
       onechan:
@@ -85,9 +79,7 @@ services:
       - 1chan
 
   yggdrasil:
-    build:
-      context: .
-      dockerfile: ./docker/yggdrasil.Dockerfile
+    build: ./yggdrasil
     container_name: yggdrasil
     depends_on:
       onechan: