From 0802cfdcb05766c337b3d7442a2025f1cddcb382 Mon Sep 17 00:00:00 2001
From: Keith Irwin <git@ki9.us>
Date: Mon, 12 Sep 2022 10:09:36 -0600
Subject: [PATCH] Moved dockerfile

---
 back/{srv/dashboard/Dockerfile => Dockerfile.dashboard} | 5 +++--
 back/{srv/dashboard/index.cgi => dashboard.cgi}         | 0
 docker-compose.yml                                      | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename back/{srv/dashboard/Dockerfile => Dockerfile.dashboard} (91%)
 rename back/{srv/dashboard/index.cgi => dashboard.cgi} (100%)

diff --git a/back/srv/dashboard/Dockerfile b/back/Dockerfile.dashboard
similarity index 91%
rename from back/srv/dashboard/Dockerfile
rename to back/Dockerfile.dashboard
index bf60b48..1f17abe 100644
--- a/back/srv/dashboard/Dockerfile
+++ b/back/Dockerfile.dashboard
@@ -11,7 +11,8 @@ RUN apt-get update && apt-get install --yes \
 
 # Copy over index.cgi
 RUN mkdir /var/www/cgi-bin/ && chown www-data:www-data /var/www/cgi-bin/
-COPY index.cgi /var/www/cgi-bin/index.cgi
+COPY dashboard.cgi /var/www/cgi-bin/index.cgi
+COPY lib/ /usr/local/bin/
 
 # Configure apache
 RUN a2enmod cgi rewrite
@@ -34,4 +35,4 @@ RUN chown www-data:www-data /var/local/wgapi_tokens
 
 # Run time!
 EXPOSE ${LISTEN_PORT}
-CMD ["apachectl", "-D", "FOREGROUND"]
\ No newline at end of file
+CMD ["apachectl", "-D", "FOREGROUND"]
diff --git a/back/srv/dashboard/index.cgi b/back/dashboard.cgi
similarity index 100%
rename from back/srv/dashboard/index.cgi
rename to back/dashboard.cgi
diff --git a/docker-compose.yml b/docker-compose.yml
index f33372c..891e6ab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,9 @@
 version: '3'
 services:
   dashboard-backend:
-    build: back/srv/dashboard
+    build: 
+      context: back
+      dockerfile: Dockerfile.dashboard
     container_name: wgapi-dashboard-backend
     cap_add:
       - NET_ADMIN
@@ -10,4 +12,3 @@ services:
       - '/etc/ssl/private:/etc/ssl/private'
       - '/etc/wgapi:/etc/wgapi:ro'
       - '/var/log/wgapi:/var/log/wgapi'
-      - './back/lib:/usr/local/bin:ro'