From 1be2846ad015123ca09eb6c1cbde3fec049e0461 Mon Sep 17 00:00:00 2001
From: Severin Schols <severin@schols.de>
Date: Thu, 3 Oct 2024 00:30:02 +0200
Subject: [PATCH] build website content right into the docker container

---
 Dockerfile        | 10 ++++++++++
 docker/Dockerfile |  5 -----
 2 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 Dockerfile
 delete mode 100644 docker/Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..512a34a
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+FROM jekyll/jekyll AS build
+COPY --chown=jekyll:jekyll . /srv/jekyll/
+RUN jekyll build
+
+FROM php:8.3-apache
+COPY docker/mumalab-website.conf /etc/apache2/conf-available/mumalab-website.conf
+COPY --from=build /srv/jekyll/_site /var/www/html
+RUN a2enconf mumalab-website && \
+    a2enmod proxy proxy_http ssl && a2enmod rewrite && \
+    pecl install apcu && docker-php-ext-enable apcu
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index 4b6b635..0000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM php:8.3-apache
-COPY mumalab-website.conf /etc/apache2/conf-available/mumalab-website.conf
-RUN a2enconf mumalab-website && \
-    a2enmod proxy proxy_http ssl && a2enmod rewrite && \
-    pecl install apcu && docker-php-ext-enable apcu
\ No newline at end of file