asd

.github/workflows/docker-x86.yml

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

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM:-linux/amd64} ubuntu:24.04
+FROM --platform=${BUILDPLATFORM:-linux/amd64} node:20-bookworm-slim
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
@@ -14,10 +14,83 @@ ENV DEBIAN_FRONTEND noninteractive
 # Just copy the package.json so it only needs to build once
 COPY package.json /enigma-bbs/
 
-# Install APT and NPM packages
+
 RUN apt-get update \
     && apt-get install -y \
     git \
+    autoconf \
+    build-essential \
+    libbsd-dev \
+    gawk \
+    bison \
+    flex \
+    pkg-config \
+    python3 \
+    nasm \
+    clang \
+    debhelper \
+    libelf-dev \
+    universal-ctags \
+    libsdl2-dev \
+    libcap-dev \
+    libao-dev \
+    libacl1-dev \
+    libsearpc-dev \
+    cmake \
+    libslirp-dev \
+    libfluidsynth-dev \
+    fluid-soundfont-gs \
+    libb64-dev \
+    libieee1284-3-dev \
+    ladspa-sdk-dev \
+    libgpm-dev  \
+    libxpm-dev \
+    libslang2-dev \
+    meson \
+    crossbuild-essential-arm64 \
+    binutils-x86-64-linux-gnu \
+    libcap2-bin \
+    libsearpc-dev
+
+
+RUN mkdir git && cd git \
+    && git clone https://github.com/stsp/nasm-segelf.git \
+    && git clone https://github.com/stsp/thunk_gen.git \
+    && git clone https://github.com/alexfru/SmallerC.git \
+    && git clone https://github.com/stsp/djstub.git \
+    && git clone https://github.com/stsp/dj64dev.git \
+    && git clone https://github.com/json-c/json-c.git \
+    && git clone https://github.com/munt/munt.git \
+    && git clone https://github.com/dosemu2/fdpp.git \
+    && git clone https://github.com/dosemu2/install-freedos.git \
+    && git clone https://github.com/dosemu2/comcom64.git \
+    && git clone https://github.com/dosemu2/dosemu2.git
+
+RUN cd git/nasm-segelf && ./configure && make && make install
+
+RUN cd git/thunk_gen && ./configure && meson compile --verbose -C build && meson install -C build
+
+RUN cd git/SmallerC && ./configure && make && make install
+
+RUN cd git/djstub && make && make install
+
+RUN cd git/dj64dev && make && make install
+
+RUN cd git/fdpp &&  ./configure && make && make install
+
+RUN cd git/munt/mt32emu && cmake -DCMAKE_BUILD_TYPE:STRING=Release . && make && make install
+
+RUN cd git/comcom64 && make && make install
+
+RUN cd git/install-freedos && make install
+
+RUN cd git/dosemu2 &&  ./default-configure && make && make install
+
+
+
+# Install APT and NPM packages
+RUN apt-get update \
+    && apt-get install -y \
     curl \
     build-essential \
     python3 \
@@ -33,26 +106,10 @@ RUN apt-get update \
     openssh-server \
     emacs-nox \
     binkd \
-    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 set progress=false && npm config set depth 0 \
     && npm install -g npm@latest \
     && npm install -g pm2 \
-    && cd /enigma-bbs && npm install \
-    && add-apt-repository -y ppa:dosemu2/ppa && apt update \
-    && apt install -y dosemu2 install-freedos
-
+    && cd /enigma-bbs && npm install
 
 # Do this after npm install to avoid cache-miss on every code change
 COPY . /enigma-bbs
@@ -69,14 +126,16 @@ 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
 
 # Use EST timezone
 RUN rm /etc/localtime && ln -s /usr/share/zoneinfo/America/New_York /etc/localtime
 
+RUN useradd -d /enigma-bbs/bbs-user bbs
+
 # enigma storage mounts
 VOLUME /enigma-bbs/art
 VOLUME /enigma-bbs/config
@@ -90,5 +149,6 @@ VOLUME /mail
 EXPOSE 8888
 
 WORKDIR /enigma-bbs
+USER bbs
 
 ENTRYPOINT ["/enigma-bbs/docker/bin/docker-entrypoint.sh"]