From 88dcc6e290db119d190f3d8bb21c2d35fedac86a Mon Sep 17 00:00:00 2001
From: Corwin Perren <caperren@gmail.com>
Date: Fri, 7 Mar 2025 23:35:24 -0800
Subject: [PATCH] Use apache for static serving

---
 .dockerignore |  3 +++
 .drone.yml    | 12 ------------
 Dockerfile    | 12 ++++--------
 3 files changed, 7 insertions(+), 20 deletions(-)
 create mode 100644 .dockerignore
 delete mode 100644 .drone.yml

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..a44058c
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+.DS_Store
+node_modules
+dist
\ No newline at end of file
diff --git a/.drone.yml b/.drone.yml
deleted file mode 100644
index ddba3c2..0000000
--- a/.drone.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-kind: pipeline
-type: docker
-name: default
-
-steps:
-  - name: docker
-    image: plugins/docker
-    settings:
-      auto_tag: true
-      repo: gitea.perren.cloud/caperren/caperren-com
-      tags:
-        - latest
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 3d5ed97..4d52cea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,12 +15,8 @@ FROM build-deps AS build
 COPY . .
 RUN npm run build
 
-FROM base AS runtime
-COPY --from=prod-deps /app/node_modules ./node_modules
-COPY --from=build /app/dist ./dist
+FROM httpd:latest AS runtime
+COPY --from=prod-deps /app/node_modules /usr/local/apache2/htdocs/node_modules
+COPY --from=build /app/dist /usr/local/apache2/htdocs/dist
 
-ENV HOST=0.0.0.0
-ENV PORT=4321
-EXPOSE 4321
-
-CMD node ./dist/server/entry.mjs
\ No newline at end of file
+EXPOSE 80
\ No newline at end of file