dosemu

.github/workflows/docker-x86.yml

@@ -0,0 +1,29 @@
+name: Docker
+
+on:
+  push:
+    branches: [ master, rebuild, dosemu ]
+
+  workflow_dispatch:
+
+jobs:
+  buildx:
+    runs-on: x86
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          tags: d.lilpenguins.com/enigma-bbs:dosemu-x86-latest
+          file: docker/Dockerfile
+          platforms: linux/amd64
+          push: true

.github/workflows/docker.yml

@@ -2,7 +2,7 @@ name: Docker
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, rebuild, dosemu ]
 
   workflow_dispatch:
 
@@ -29,7 +29,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v3
         with:
-          tags: d.lilpenguins.com/enigma-bbs:latest
+          tags: d.lilpenguins.com/enigma-bbs:dosemu-latest
           file: docker/Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8
+          platforms: linux/arm64,linux/arm/v7,linux/arm/v8
           push: true

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM:-linux/amd64} node:20-bookworm-slim
+FROM --platform=${BUILDPLATFORM:-linux/amd64} ubuntu:24.04
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
@@ -33,10 +33,25 @@ RUN apt-get update \
     openssh-server \
     emacs-nox \
     binkd \
-    && npm set progress=false && npm config set depth 0 \
+    software-properties-common \
+    ca-certificates \
+    curl \
+    gnupg \
+    python3-setuptools \
+    python3
+
+
+RUN mkdir -p /etc/apt/keyrings  \
+    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+    && apt update && apt install -y nodejs
+
+RUN npm set progress=false && npm config set depth 0 \
     && npm install -g npm@latest \
     && npm install -g pm2 \
-    && cd /enigma-bbs && npm install
+    && cd /enigma-bbs && npm install \
+    && add-apt-repository -y ppa:dosemu2/ppa && apt update \
+    && apt install -y dosemu2 install-freedos
 
 
 # Do this after npm install to avoid cache-miss on every code change
@@ -54,8 +69,8 @@ RUN dos2unix /enigma-bbs/docker/bin/docker-entrypoint.sh \
     && cp -rp art/* ../enigma-bbs-pre/art/ \
     && cp -rp mods/* ../enigma-bbs-pre/mods/ \
     && cp -rp config/* ../enigma-bbs-pre/config/ \
-    && apt-get remove build-essential python3 libssl-dev git curl -y \
-    && apt-get autoremove -y \
+#    && apt-get remove build-essential python3 libssl-dev git curl -y \
+#    && apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
     && apt-get clean