Added Game Double Up! 1.0, Utility BLAM 2.0

.dockerignore

@@ -1,4 +1,3 @@
 cleaninstall/
 .git/
 Makefile
-devel/

.gitlab-ci.yml

@@ -13,7 +13,6 @@ services:
 - docker:dind
 
 before_script:
-- apk add curl
 - docker info
 - docker version
 - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
@@ -34,12 +33,11 @@ build:
   stage: build
   script:
   - if [ -f init ]; then chmod 500 init; fi
-  - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
+  # docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
   - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
   - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
-  - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
-  - if [ -n "${TRIGGER_PIPELINE}" ]; then curl -sSX POST -F token=${TRIGGER_PIPELINE} -F ref=x86_64-extras http://dev.leenooks.net/api/v4/projects/45/trigger/pipeline > /dev/null; fi
+  # docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
   tags:
   - docker
   only:
-  - x86_64
+  - /^x86_64-.*/

Dockerfile

@@ -1,33 +1,26 @@
 # NAME leenooks/mysticbbs
-# VERSION 1.12a39-x86_64
+# VERSION 1.12a39-x86_64-extras
 
-FROM debian:stretch-slim
+FROM registry.leenooks.net/leenooks/mysticbbs:1.12a39-x86_64
 
-MAINTAINER Deon George <deon@leenooks.net>
+## Add Mystic Mods
+# Game DBLup - Double-Up! v1.0
+RUN SOURCE_URL=http://yum.leenooks.net/bbs/MysticBBS/mods && FILE=DBLUP10.ZIP && \
+	cd /tmp && \
+	curl -O ${SOURCE_URL}/${FILE} && \
+	unzip ${FILE} && \
+	cd /mystic/ && \
+	mv /tmp/sysop.txt docs/mod-dblup-1.0-sysop.txt && \
+	mv /tmp/doubleup.mps scripts/ && cd scripts && ./mplc doubleup.mps && \
+	rm -rf /tmp/**
 
-# Pre-requisites
-# + Base application requires unzip zip curl libhunspell-dev libpython2.7
-RUN apt-get update \
-	&& apt-get install -yqq unzip zip curl libhunspell-dev libpython2.7 \
-	&& rm -rf /var/lib/apt/lists/* /tmp/*
-
-# Add in Leenooks' apt repository
-RUN curl -s http://apt.leenooks.net/setup.sh | sh
-
-# For SSH connections
-RUN apt-get update \
-	&& apt-get install --allow-unauthenticated -yqq cryptlib \
-	&& rm -rf /var/lib/apt/lists/* /tmp/*
-
-RUN ln -sf /usr/share/zoneinfo/Australia/Melbourne /etc/localtime
-
-WORKDIR /mystic
-ENV mysticbbs /mystic/data
-EXPOSE 22 23 24554
-
-COPY init /sbin/init
-ENTRYPOINT [ "/sbin/init" ]
-CMD [ "start" ]
-
-ADD mystic.tar.gz /
-VOLUME ["/mystic/data"]
+# Utility BLAM - BBS List Admin Manager v2.1
+RUN SOURCE_URL=http://yum.leenooks.net/bbs/MysticBBS/mods && FILE=GYBLAM21.ZIP && \
+	cd /tmp && \
+	curl -O ${SOURCE_URL}/${FILE} && \
+	unzip ${FILE} && \
+	cd /mystic/ && \
+	mv /tmp/sysop.txt docs/mod-blam-2.1-sysop.txt && \
+	mv /tmp/gy-blam.ini docs/mod-blam-2.1-gy-blam.ini && \
+	mv /tmp/gy-blam.mps scripts/ && cd scripts && ./mplc gy-blam.mps && \
+	rm -rf /tmp/**

README.md

@@ -35,7 +35,7 @@ To use this container:
     | :- | :-- |
     | -d | Detached mode: run the container in the background and print the new container ID. |
     | -i | Keep STDIN open even if not attached. (required) |
-    | --name= | Give your container a specific name. (optional) |
+    | -n | Give your container a specific name. (optional) |
     | -p | Map host ports to container ports. (may be required, otherwise recommended) |
     | -t | Allocate a pseudo-TTY. (required) |
     | -v | Map a path on the host into the container (optional but recommended). |
@@ -63,5 +63,16 @@ If you want to monitor your container, or stop it, attach to the console with:
 You can also run this in a swarm (I do)!
 
 ----
-## Extras Container
-There is an "extras" container with some additional MysticBBS mods pre-installed. You'll find info on that in the [x86_64-extras](https://dev.leenooks.net/leenooks/mysticbbs/blob/x86_64-extras/README.md#info-on-the-images) branch.
+## Info on the Images
+
+### leenooks/mysticbbs:1.12a39-armv7l (Branch: armv7l)
+This image is a clean install of Mystic BBS v1.12a39. It is ready for you to configure and personalise.
+
+### leenooks/mysticbbs:1.12a39-armv7l-extras (Branch: armv7l-extras)
+This image is based on the above image, with the follow additional games/tools installed. You'll need to refer to the documentation in the docs/ directory (inside the container) for details on how to configure these mods. The docs are named `mod-<NAME OF MOD>-...`
+
+| Category | Name | Description |
+| :- | :- | :- |
+| Game | Double Up | Double Up! for Mystic V1.0 by Darryl Perry |
+| Utility | BLAM | BBS List Admin Manager for Mystic v2.0 by Darryl Perry |
+