From c2cbbc940fcc2726009b10786f03e6853546b38f Mon Sep 17 00:00:00 2001
From: Mark Bundschuh <bundschuhmark@gmail.com>
Date: Mon, 18 Mar 2024 17:20:48 -0400
Subject: [PATCH] update arch image

---
 README.md                   |  2 +-
 images/Dockerfile.archlinux | 13 ++++++++++++-
 images/docker-compose.yaml  | 10 ++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 images/docker-compose.yaml

diff --git a/README.md b/README.md
index 993263c..893cd36 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Play tag in the browser!
 - The players then switch computers and try to find the backdoors installed by the other player and remove them in again 7 minutes
 - Points are scored for each backdoor that was installed which still remained
   - What counts as a backdoor is at the discretion of the adjudicator
-  - In general backdoors can be privaledge escalation, remote access, other persistence, etc.
+  - In general backdoors can be privilege escalation, remote access, other persistence, etc.
   - The players should not render the their own computer unusable before switching (don't lock root user, completely destroy config files, etc.)
 
 ## Usage
diff --git a/images/Dockerfile.archlinux b/images/Dockerfile.archlinux
index b73b3a4..960308c 100644
--- a/images/Dockerfile.archlinux
+++ b/images/Dockerfile.archlinux
@@ -7,9 +7,20 @@ RUN systemctl set-default multi-user.target
 RUN useradd --create-home --shell /bin/bash admin && echo "admin:admin" | chpasswd
 RUN usermod -aG wheel admin
 
-RUN pacman -Syu --noconfirm wget tmux sudo neofetch vim
+RUN pacman -Syu --noconfirm wget apache php php-apache tmux sudo neofetch vim vi nano openssh cronie which python gcc make zip unzip npm
 RUN sed -i 's/# %wheel ALL=(ALL:ALL) NOPASSWD: ALL/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/g' /etc/sudoers
 
+RUN sed -i 's/LoadModule mpm_event_module/#LoadModule mpm_event_module/g' /etc/httpd/conf/httpd.conf \
+    && sed -i 's/#LoadModule mpm_prefork_module/LoadModule mpm_prefork_module/g' /etc/httpd/conf/httpd.conf \
+    && echo "LoadModule php_module modules/libphp.so" >> /etc/httpd/conf/httpd.conf \
+    && echo "AddHandler php-script .php" >> /etc/httpd/conf/httpd.conf \
+    && echo "Include conf/extra/php_module.conf" >> /etc/httpd/conf/httpd.conf \
+    && echo "DirectoryIndex index.php index.html" >> /etc/httpd/conf/httpd.conf
+
+RUN systemctl enable httpd
+RUN systemctl enable sshd
+RUN systemctl enable cronie
+
 RUN wget https://github.com/tsl0922/ttyd/releases/download/1.7.4/ttyd.x86_64 -O /usr/bin/ttyd.x86_64
 RUN chmod +x /usr/bin/ttyd.x86_64
 
diff --git a/images/docker-compose.yaml b/images/docker-compose.yaml
new file mode 100644
index 0000000..cd7491e
--- /dev/null
+++ b/images/docker-compose.yaml
@@ -0,0 +1,10 @@
+services:
+  archlinux:
+    build:
+      dockerfile: Dockerfile.archlinux
+    privileged: true
+    ports:
+      - "1001:7681"
+      - "1002:7682"
+    volumes:
+      - ./autotag1.env:/etc/autotag.env