summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMalfurious <m@lfurio.us>2023-09-16 06:06:37 -0400
committerMalfurious <m@lfurio.us>2023-09-16 08:00:08 -0400
commit2ec1cd2ef77ef5b725c5db2755806459e19cec11 (patch)
treebf07832e19bfee34fc7d34e768beb1bacbbbdfe8
parentba4da49423faaf49500f1b3366909e404f7862ff (diff)
downloadsrcnode-2ec1cd2ef77ef5b725c5db2755806459e19cec11.tar.gz
srcnode-2ec1cd2ef77ef5b725c5db2755806459e19cec11.zip
cgit: Port Dockerfile for alpine base
Move the cgit image off of archlinux for the same reasons as gitolite. However, in this case, debian isn't necessary, and going with alpine will give even smaller images. As is, it seems simpler to port the config files over to alpine anyway. See 90858ead45f6 for more context. Signed-off-by: Malfurious <m@lfurio.us>
-rw-r--r--cgit/Dockerfile12
-rw-r--r--docker/Dockerfile.cgit16
2 files changed, 12 insertions, 16 deletions
diff --git a/cgit/Dockerfile b/cgit/Dockerfile
new file mode 100644
index 0000000..9e1c442
--- /dev/null
+++ b/cgit/Dockerfile
@@ -0,0 +1,12 @@
+# https://git.zx2c4.com/cgit/
+
+FROM alpine
+
+RUN apk --no-cache upgrade
+RUN apk --no-cache add apache2 cgit
+
+COPY httpd.conf /etc/apache2/
+COPY cgitrc /etc/
+
+EXPOSE 80
+CMD ["/usr/sbin/httpd", "-DFOREGROUND"]
diff --git a/docker/Dockerfile.cgit b/docker/Dockerfile.cgit
deleted file mode 100644
index 768a53d..0000000
--- a/docker/Dockerfile.cgit
+++ /dev/null
@@ -1,16 +0,0 @@
-# https://git.zx2c4.com/cgit/
-# https://wiki.archlinux.org/title/Cgit
-
-FROM archlinux
-
-# Install cgit and webserver
-RUN pacman-key --init
-RUN pacman -Syu --needed --noconfirm apache cgit
-
-# Copy configuration files
-# Back-end datastore is expected to be mounted to /data (read-only)
-COPY httpd.conf /etc/httpd/conf/httpd.conf
-COPY cgitrc /etc/cgitrc
-
-EXPOSE 80
-CMD ["/usr/bin/httpd", "-DFOREGROUND"]