Merge e66f9ee into 3ab9e1d

Author: katzterd

.github/workflows/docker-build.yml

@@ -6,61 +6,53 @@ on:
       - master
 
 env:
-  ONECHAN_IMAGE_NAME: 1chan
+  APP_IMAGE_NAME: app
   TORGATE_IMAGE_NAME: torgate
   I2PGATE_IMAGE_NAME: i2pgate
-  YGGDRASILGATE_IMAGE_NAME: yggdrasil
+  YGGDRASILGATE_IMAGE_NAME: yggdrasilgate
 
 jobs:
-
   buildDocker:
     runs-on: ubuntu-latest
     permissions:
       pull-requests: read
       packages: write
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v4
-      -
-        name: Filter
+      - name: Filter
         uses: tj-actions/changed-files@v46.0.5
         id: filter
         with:
           files_yaml: |
-            onechan:
+            app:
               - 'frontend/**'
             torgate:
               - 'torgate/**'
             i2pgate:
               - 'i2pgate/**'
             yggdrasilgate:
-              - 'yggdrasil/**'
-      -
-        name: Set up QEMU
+              - 'yggdrasilgate/**'
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      -
-        name: Log in to registry
+      - name: Log in to registry
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
-      -
-        name: Build 1chan
+      - name: Build 1chan
         uses: docker/build-push-action@v5
-        if: steps.filter.outputs.onechan_any_changed == 'true'
+        if: steps.filter.outputs.app_any_changed == 'true'
         with:
           context: frontend/.
           file: frontend/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ghcr.io/${{ github.repository }}/${{ env.ONECHAN_IMAGE_NAME }}:latest
+          tags: ghcr.io/${{ github.repository }}/${{ env.APP_IMAGE_NAME }}:latest
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-      -
-        name: Build torgate
+      - name: Build torgate
         uses: docker/build-push-action@v5
         if: steps.filter.outputs.torgate_any_changed == 'true'
         with:
@@ -72,8 +64,7 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-      -
-        name: Build i2pgate
+      - name: Build i2pgate
         uses: docker/build-push-action@v5
         if: steps.filter.outputs.i2pgate_any_changed == 'true'
         with:
@@ -85,13 +76,12 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-      -
-        name: Build yggdrasilgate
+      - name: Build yggdrasilgate
         uses: docker/build-push-action@v5
         if: steps.filter.outputs.yggdrasilgate_any_changed == 'true'
         with:
-          context: yggdrasil/.
-          file: yggdrasil/Dockerfile
+          context: yggdrasilgate/.
+          file: yggdrasilgate/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ghcr.io/${{ github.repository }}/${{ env.YGGDRASILGATE_IMAGE_NAME }}:latest

.gitignore

@@ -1,13 +1,13 @@
 /*
-!frontend
-!i2pgate
-!k8s
-!torgate
-!yggdrasil
-!.github
-!docker-compose.yaml
-!LICENSE
-!README.md
-!README_OLD.md
-!.env-dist
-!.gitignore
+!/frontend
+!/i2pgate
+!/k8s
+!/torgate
+!/yggdrasilgate
+!/.github
+!/docker-compose.yaml
+!/LICENSE
+!/README.md
+!/README_OLD.md
+!/.env-dist
+!/.gitignore

README.md

@@ -9,36 +9,41 @@
 ### Docker compose way
 
 #### 1. Prepare `.env`
+
 ```console
 cp .env-dist .env
 ```
+
 Then fill fields in `.env` by your text editor with needed values
 
 You can create your own css themes or edit existing ones. Script will copy all css files which ends with `.example`. See in [/www/css/themes](https://github.com/katzterd/1chan-docker/tree/master/www/css/themes)
 
 #### 2. Deploy
+
 ```console
 docker compose up -d
 ```
 
 #### 3. Setup db and admin account
+
 ```console
-docker exec -t onechan /docker-entrypoint.sh install
+docker exec -t app /docker-entrypoint.sh install
 ```
 
-#### 4. Restart `onechan` container to run indexer properly after db setup
+#### 4. Restart `app` container to run indexer properly after db setup
+
 ```console
-docker compose restart onechan
+docker compose restart app
 ```
 
 frontend will appear on `http://localhost:80`
 
-
-
 #### (Optional) Get yggdrasil node address (if enabled)
+
 ```console
-docker exec -t yggdrasil /docker-entrypoint.sh getaddr
+docker exec -t yggdrasilgate /docker-entrypoint.sh getaddr
 ```
 
 ### K8S way
+
 See in [/k8s](https://github.com/katzterd/1chan/tree/master/k8s)

docker-compose.yaml

@@ -1,23 +1,7 @@
-services: 
-
-  db:
-    image: mariadb:11.6
-    container_name: db
-    ports:
-      - "3306:3306"
-    env_file:
-      - .env
-    environment:
-      MARIADB_RANDOM_ROOT_PASSWORD: 1
-    restart: always
-    volumes:
-      - mariadb_data:/var/lib/mysql
-    networks:
-      - 1chan
-
-  onechan:
+services:
+  app:
     build: ./frontend
-    container_name: onechan
+    container_name: app
     restart: always
     env_file:
       - .env
@@ -27,7 +11,7 @@ services:
       SRV_HOST: "127.0.0.1"
       SRV_PORT: "9393"
       SRV_LOCAL_HOST: "127.0.0.1"
-      REDIS_HOST: "redis"
+      REDIS_HOST: "cache"
       REDIS_PORT: "6379"
       SPHINX_HOST: "127.0.0.1"
       SPHINX_PORT: "3312"
@@ -52,37 +36,63 @@ services:
       - 1chan
     depends_on:
       - db
-      - redis
+      - cache
+
+  db:
+    image: mariadb:11.6
+    container_name: db
+    ports:
+      - "3306:3306"
+    env_file:
+      - .env
+    environment:
+      MARIADB_RANDOM_ROOT_PASSWORD: 1
+    restart: always
+    volumes:
+      - mariadb_data:/var/lib/mysql
+    networks:
+      - 1chan
+
+  cache:
+    image: redis:7-alpine
+    container_name: cache
+    ports:
+      - "6379:6379"
+    restart: always
+    volumes:
+      - cache_data:/data
+    networks:
+      - 1chan
 
   torgate:
     build: ./torgate
     container_name: torgate
     depends_on:
-      onechan:
+      app:
         condition: service_started
         restart: false
     env_file:
       - .env
     networks:
       - 1chan
-        
+
   i2pgate:
     build: ./i2pgate
     container_name: i2pgate
     depends_on:
-      onechan:
+      app:
         condition: service_started
         restart: false
     env_file:
       - .env
     networks:
       - 1chan
-        
-  yggdrasil:
-    build: ./yggdrasil
-    container_name: yggdrasil
+
+  yggdrasilgate:
+    build: ./yggdrasilgate
+    container_name: yggdrasilgate
     depends_on:
-      onechan:
+      app:
         condition: service_started
         restart: false
     env_file:
@@ -96,20 +106,9 @@ services:
     sysctls:
       - "net.ipv6.conf.all.disable_ipv6=0"
 
-  redis:
-    image: redis:7-alpine
-    container_name: redis
-    ports:
-      - "6379:6379"
-    restart: always
-    volumes:
-      - redis_data:/data
-    networks:
-      - 1chan
-
 volumes:
   mariadb_data:
-  redis_data:
+  cache_data:
   www-smilies:
   www-homeboards:
   www-uploads:

frontend/app/views/markup/index.php

@@ -72,11 +72,13 @@
 							</dd>
 						</dl>
 						<p>
-							Кроме перечисленных тут кодов существуют еще несколько, но пускай это будет сюрпризом.
-							Например, можно попробовать использовать списки.
+							Кроме перечисленных тут кодов существуют еще <a href="https://texy.info/en/syntax-full">несколько</a>, но пускай это будет сюрпризом.
 						</p>
                         <p>
-                            Все смайлики: <?php echo $this -> getParameter('smilies'); ?>
+                            <h4>Все смайлики:</h4>
+                            <p>
+                            <?php echo $this -> getParameter('smilies'); ?>
+                            </p>
                         </p>
 					</div>
 				</div>

i2pgate/supervisord.conf

@@ -10,5 +10,5 @@ stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
-[program:onechan-forward]
-command=socat TCP4-LISTEN:8080,fork,forever,reuseaddr TCP4:onechan:80
+[program:app-forward]
+command=socat TCP4-LISTEN:8080,fork,forever,reuseaddr TCP4:app:80

k8s/.gitignore

@@ -1,9 +1,6 @@
-*
-!examples
-!helm
-!README.md
-!.cr.yaml
-!encrypted_secrets.yaml
-!pub-sealed-secrets.pem
-!.env-dist
-!.gitignore
+/*
+!/helm
+!/README.md
+!/.cr.yaml
+!/.env-dist
+!/.gitignore