chore: refactor-docker-structure (#1948)

* move dockerfiles to dedicated folder

* consolidate docker related files to docker dir

* update CI references

* experimental omni style container

* update makefile commands

* update references

* fix whitespace

* single container docs

* update build paths

* adds omni style build

* set context

.github/workflows/nightly.yml

@@ -58,7 +58,7 @@ jobs:
           port: ${{ secrets.DEMO_SERVER_PORT }}
           script_stop: true
           script: |
-            cd ~/docker/mealie-next
+            cd ~/docker/mealie
             docker-compose pull
             docker-compose down -v
             docker-compose up -d

.github/workflows/partial-backend.yml

@@ -70,7 +70,7 @@ jobs:
         run: |
           poetry run black . --check
 
-      - name: Lint (Flake8)
+      - name: Lint (Ruff)
         run: |
           make backend-lint
 

.github/workflows/partial-builder.yml

@@ -40,11 +40,10 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build Frontend Image
-        working-directory: "frontend"
         run: |
           docker build --push --no-cache \
             --tag hkotel/mealie:frontend-${{ inputs.tag }} \
-            --platform linux/amd64,linux/arm64 .
+            --platform linux/amd64,linux/arm64 --file=./docker/frontend.Dockerfile .
 
   build-backend:
     runs-on: ubuntu-latest
@@ -77,4 +76,37 @@ jobs:
           docker build --push --no-cache \
             --tag hkotel/mealie:api-${{ inputs.tag }}  \
             --build-arg COMMIT=$(git rev-parse HEAD) \
-            --platform linux/amd64,linux/arm64 .
+            --platform linux/amd64,linux/arm64 --file=./docker/api.Dockerfile .
+
+  build-omni:
+    runs-on: ubuntu-latest
+    name: Build Backend
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v1
+        with:
+          image: tonistiigi/binfmt:latest
+          platforms: all
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          install: true
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build Omni-Image
+        run: |
+          docker build --push --no-cache \
+            --tag hkotel/mealie:omni-${{ inputs.tag }}  \
+            --build-arg COMMIT=$(git rev-parse HEAD) \
+            --platform linux/amd64,linux/arm64 --file=./docker/omni.Dockerfile .

.github/workflows/partial-trivy-backend-container-scanning.yml

@@ -15,7 +15,7 @@ jobs:
 
       - name: Build Dockerfile
         run: |
-          docker build -t mealie .
+          docker build -t mealie --file=./docker/api.Dockerfile .
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master

.github/workflows/partial-trivy-frontend-container-scanning.yml

@@ -15,7 +15,7 @@ jobs:
 
       - name: Build Dockerfile
         run: |
-          docker build -t mealie ./frontend/
+          docker build -t mealie --file=./docker/frontend.Dockerfile .
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master