From a4029725f903c929c84c2591ed7317255fb2480d Mon Sep 17 00:00:00 2001
From: Brock H Caldwell <brock@caldwellnetworks.com>
Date: Sun, 25 May 2025 15:18:50 -0500
Subject: [PATCH] fix: bad path in dockerfile copy, chore: cleanup

---
 .gitignore                               |  1 +
 Dockerfile                               |  2 +-
 bash/app/wget_download.sh                |  2 --
 bash/nginx.conf                          | 32 ------------------------
 docker/Dockerfile.app                    |  2 +-
 docker/app/{site.caddyfile => Caddyfile} |  0
 {bash => docker/app}/entrypoint.sh       |  0
 docker/app/supervisord.conf              |  9 -------
 8 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100755 bash/app/wget_download.sh
 delete mode 100755 bash/nginx.conf
 rename docker/app/{site.caddyfile => Caddyfile} (100%)
 rename {bash => docker/app}/entrypoint.sh (100%)
 delete mode 100644 docker/app/supervisord.conf

diff --git a/.gitignore b/.gitignore
index a079886..e44d252 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .idea
+bolt.db
 ###> symfony/framework-bundle ###
 /.env.local
 /.env.local.php
diff --git a/Dockerfile b/Dockerfile
index e243feb..7845681 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,4 +13,4 @@ RUN install-php-extensions \
 
 HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD [ "php", "/app/bin/console", "startup:status" ]
 
-COPY docker/app/site.caddyfile /etc/frankenphp/Caddyfile
+COPY docker/app/Caddyfile /etc/frankenphp/Caddyfile
diff --git a/bash/app/wget_download.sh b/bash/app/wget_download.sh
deleted file mode 100755
index 168c033..0000000
--- a/bash/app/wget_download.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# $1 = movies/tvshows/etc, $2 = title of media, $3 = URL of download
-cd /var/download/${1} && if [ ! -d "${2}" ]; then mkdir "${2}"; fi && cd "${2}" && wget "${3}"
diff --git a/bash/nginx.conf b/bash/nginx.conf
deleted file mode 100755
index 3a43bd3..0000000
--- a/bash/nginx.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-server {
-    listen       80;
-    listen  [::]:80;
-    server_name  localhost;
-
-    root /var/www/public;
-
-    location /hub/ {
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header Host $host;
-        proxy_redirect   off;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_pass http://mercure/;
-    }
-
-
-    location / {
-        # try to serve file directly, fallback to index.php
-        try_files $uri /index.php$is_args$args;
-    }
-
-    location ~ \.php$ {
-        fastcgi_pass unix:/run/php-fpm.sock;
-        fastcgi_split_path_info ^(.+\.php)(/.*)$;
-        fastcgi_buffers 16 16k;
-        fastcgi_buffer_size 32k;
-        include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
-        fastcgi_param DOCUMENT_ROOT $realpath_root;
-        internal;
-    }
-}
\ No newline at end of file
diff --git a/docker/Dockerfile.app b/docker/Dockerfile.app
index 5e7d353..2107782 100644
--- a/docker/Dockerfile.app
+++ b/docker/Dockerfile.app
@@ -11,7 +11,7 @@ RUN install-php-extensions \
 	opcache
 
 COPY . /app
-COPY --chmod=775 ./bash/entrypoint.sh /usr/local/bin/docker-entrypoint
+COPY --chmod=775 docker/app/entrypoint.sh /usr/local/bin/docker-entrypoint
 COPY docker/app/Caddyfile /etc/frankenphp/Caddyfile
 
 ENTRYPOINT [ "/usr/local/bin/docker-entrypoint" ]
diff --git a/docker/app/site.caddyfile b/docker/app/Caddyfile
similarity index 100%
rename from docker/app/site.caddyfile
rename to docker/app/Caddyfile
diff --git a/bash/entrypoint.sh b/docker/app/entrypoint.sh
similarity index 100%
rename from bash/entrypoint.sh
rename to docker/app/entrypoint.sh
diff --git a/docker/app/supervisord.conf b/docker/app/supervisord.conf
deleted file mode 100644
index fb88dc4..0000000
--- a/docker/app/supervisord.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[program:messenger-consume]
-command=php /var/www/bin/console messenger:consume async --time-limit=3600
-user=nobody
-numprocs=2
-startsecs=0
-autostart=true
-autorestart=true
-startretries=10
-process_name=%(program_name)s_%(process_num)02d
\ No newline at end of file