From 9669235bfb623f7710a996401641847d2010f9bf Mon Sep 17 00:00:00 2001
From: Marco Szulik <marco.szulik@goodbabyint.com>
Date: Tue, 16 Jan 2024 08:49:29 +0100
Subject: [PATCH] use correct docker build context and reference Dockerfile

---
 .github/workflows/docker.yml   |  2 +-
 docker-compose.prod.yml        | 16 ----------------
 docker-compose.pullpreview.yml |  4 ++--
 docker/Dockerfile              | 12 ++++++------
 4 files changed, 9 insertions(+), 25 deletions(-)
 delete mode 100644 docker-compose.prod.yml

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 2aa59f08..5ce24163 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -35,6 +35,6 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           push: true
-          context: ./docker
+          file: ./docker/Dockerfile
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
deleted file mode 100644
index f240348e..00000000
--- a/docker-compose.prod.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: '3.8'
-services:
-  app:
-    container_name: ${DOCKER_CONTAINER_NAME:-transmorpher}
-    image: mszulik/transmorpher
-    volumes:
-      - '.env:/var/www/html/.env'
-    networks:
-      - shared
-    labels:
-      - 'traefik.enable=true'
-      - 'traefik.http.routers.transmorpher.rule=Host(`transmorpher.test`)'
-      - 'traefik.http.services.transmorpher.loadbalancer.server.port=80'
-networks:
-  shared:
-    external: true
diff --git a/docker-compose.pullpreview.yml b/docker-compose.pullpreview.yml
index 7aaaaa9a..d32daabf 100644
--- a/docker-compose.pullpreview.yml
+++ b/docker-compose.pullpreview.yml
@@ -3,8 +3,8 @@ services:
   app:
     container_name: ${APP_CONTAINER_NAME:-transmorpher}
     build:
-      context: ./docker
-      dockerfile: Dockerfile
+      context: .
+      dockerfile: ./docker/Dockerfile
     networks:
       - traefik
       - internal
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f5143cd2..8b2b01c6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -9,17 +9,17 @@ LABEL com.centurylinklabs.watchtower.lifecycle.post-update-timeout="1440"
 # Watchtower will run this script after restarting the updated container.
 LABEL com.centurylinklabs.watchtower.lifecycle.post-update="/var/www/html/docker/watchtower.sh"
 
-COPY ../ /var/www/html
-COPY ./workers.conf /opt/docker/etc/supervisor.d/
+COPY . /var/www/html
+COPY ./docker/workers.conf /opt/docker/etc/supervisor.d/
 
 RUN composer install --no-interaction --no-dev
 
-RUN chmod +x ./docker/entryfile.sh
-RUN chmod +x ./docker/watchtower.sh
+RUN chmod +x /var/www/html/docker/entryfile.sh
+RUN chmod +x /var/www/html/docker/watchtower.sh
 RUN chmod 755 -R /var/www/html/storage
 RUN chown -R application:application /var/www/html/storage
 
-RUN php artisan storage:link
+RUN php /var/www/html/artisan storage:link
 
 RUN apt update
 RUN apt install -y imagemagick jpegoptim optipng pngquant gifsicle webp ffmpeg
@@ -27,4 +27,4 @@ RUN apt install -y imagemagick jpegoptim optipng pngquant gifsicle webp ffmpeg
 RUN docker-service-enable cron
 RUN docker-cronjob '0 2 * * * application php /var/www/html/artisan ffmpeg:delete-temp
 
-ENTRYPOINT ["./entryfile.sh"]
+ENTRYPOINT ["/var/www/html/docker/entryfile.sh"]