From 09c7358e944ec12ffbdf9358772b172831c63a5d Mon Sep 17 00:00:00 2001
From: Tatevik <tatevikg1@gmail.com>
Date: Thu, 7 May 2026 19:01:50 +0400
Subject: [PATCH 1/2] Add dockerhub publish workflow

---
 .github/workflows/docker-publish.yml | 58 ++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 .github/workflows/docker-publish.yml

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
new file mode 100644
index 0000000..abbbbc5
--- /dev/null
+++ b/.github/workflows/docker-publish.yml
@@ -0,0 +1,58 @@
+name: Build And Publish Container
+
+on:
+  push:
+    branches:
+      - docker-publish
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - docker-publish
+  workflow_dispatch:
+
+env:
+  DOCKERHUB_IMAGE: tatevikg1/phplist4
+
+jobs:
+  docker:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Docker Hub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.DOCKERHUB_IMAGE }}
+          tags: |
+            type=raw,value=test,enable={{is_default_branch}}
+            type=ref,event=tag
+            type=sha,prefix=sha-
+
+      - name: Build and push image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+

From d683f416172e10c78ceae6f9df73fd73aa00a3a1 Mon Sep 17 00:00:00 2001
From: Tatevik <tatevikg1@gmail.com>
Date: Mon, 11 May 2026 12:40:50 +0400
Subject: [PATCH 2/2] Fix docker compose configs

---
 docker-compose.yml             | 11 +++++++----
 docker/apache/000-default.conf | 12 ++++++++++++
 docker/apache/ports.conf       |  1 +
 docker/apache/servername.conf  |  1 +
 4 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 docker/apache/000-default.conf
 create mode 100644 docker/apache/ports.conf
 create mode 100644 docker/apache/servername.conf

diff --git a/docker-compose.yml b/docker-compose.yml
index 07753ef..08981ae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     image: tatevikg1/phplist:test
     container_name: base-distribution-app
     ports:
-      - "${PHPLIST_PORT:-8081}:80"
+      - "${PHPLIST_PORT:-8081}:8081"
     environment:
       # Database connection (mirrors config/parameters.yml expectations)
       PHPLIST_DATABASE_NAME: phplistdb
@@ -13,9 +13,9 @@ services:
       PHPLIST_DATABASE_DRIVER: ${PHPLIST_DATABASE_DRIVER:-pdo_mysql} # pdo_pgsql
       PHPLIST_DATABASE_HOST: ${PHPLIST_DATABASE_HOST:-db} # postgres
       PHPLIST_DATABASE_PORT: ${PHPLIST_DATABASE_PORT:-3306} # 5432
-      REST_API_BASE_URL: 'http://app/'
-      FRONT_END_BASE_URL: 'http://app/'
-      API_BASE_URL: 'http://app/'
+      REST_API_BASE_URL: 'http://app:8081/'
+      FRONT_END_BASE_URL: 'http://app:8081/'
+      API_BASE_URL: 'http://app:8081/'
 
       # Symfony environment
       APP_ENV: prod
@@ -25,6 +25,9 @@ services:
     volumes:
       - ./var/logs:/var/www/html/var/log
       - ./var/cache:/var/www/html/var/cache
+      - ./docker/apache/servername.conf:/etc/apache2/conf-enabled/servername.conf:ro
+      - ./docker/apache/ports.conf:/etc/apache2/ports.conf:ro
+      - ./docker/apache/000-default.conf:/etc/apache2/sites-available/000-default.conf:ro
     networks: [ appnet ]
 
     command: >
diff --git a/docker/apache/000-default.conf b/docker/apache/000-default.conf
new file mode 100644
index 0000000..045831b
--- /dev/null
+++ b/docker/apache/000-default.conf
@@ -0,0 +1,12 @@
+<VirtualHost *:8081>
+    ServerName app
+    DocumentRoot /var/www/html/public
+
+    <Directory /var/www/html/public>
+        AllowOverride All
+        Require all granted
+    </Directory>
+
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+</VirtualHost>
diff --git a/docker/apache/ports.conf b/docker/apache/ports.conf
new file mode 100644
index 0000000..615d1eb
--- /dev/null
+++ b/docker/apache/ports.conf
@@ -0,0 +1 @@
+Listen 8081
diff --git a/docker/apache/servername.conf b/docker/apache/servername.conf
new file mode 100644
index 0000000..0a539da
--- /dev/null
+++ b/docker/apache/servername.conf
@@ -0,0 +1 @@
+ServerName app