From 797cb7e88189dc99546aff087305dc282abf1e58 Mon Sep 17 00:00:00 2001 From: Deon George Date: Sun, 3 Feb 2019 12:51:28 +1100 Subject: [PATCH] Update to 1.12A42 --- .gitlab-ci.yml | 5 +++-- Dockerfile | 30 +++++++++++++++--------------- init | 24 ------------------------ 3 files changed, 18 insertions(+), 41 deletions(-) delete mode 100755 init diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ee4c81b..67d206e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ stages: - build variables: - VERSION: 1.12a39-${CI_COMMIT_REF_NAME} + VERSION: 1.12a42-${CI_COMMIT_REF_NAME} CACHETAG: build-${CI_COMMIT_REF_NAME} DOCKER_HOST: tcp://docker:2375 @@ -38,6 +38,7 @@ build: - docker push ${CI_REGISTRY_IMAGE}:${VERSION} - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG} tags: - - docker-armv7l + - docker + - armv7l only: - /^armv7l-.*/ diff --git a/Dockerfile b/Dockerfile index 381eb71..130adb7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,19 @@ # NAME leenooks/mysticbbs -# VERSION 1.12a39-armv7l-extras +# VERSION 1.12a42-armv7l-extras # NOTE: ** WHEN UPDATING ** there may be missing files in your data directory # that are present in the data.tar.gz file. -FROM registry.leenooks.net/leenooks/mysticbbs:1.12a39-armv7l +FROM registry.leenooks.net/leenooks/mysticbbs:1.12a42-armv7l -# Makenl 3.4.6 +# Makenl RUN apt-get update \ && apt-get install --no-install-recommends --allow-unauthenticated -yqq makenl \ && rm -rf /var/lib/apt/lists/* /tmp/* #1 ## Add Mystic Mods # Game DBLup - Double-Up! v1.0 -RUN SOURCE_URL=https://chinwag.leenooks.net/mods && FILE=DBLUP10.ZIP && \ +RUN SOURCE_URL=https://chinwag.leenooks.net/bbs/mystic/mods && FILE=DBLUP10.ZIP && \ cd /tmp && \ curl -O ${SOURCE_URL}/${FILE} && \ unzip ${FILE} && \ @@ -23,7 +23,7 @@ RUN SOURCE_URL=https://chinwag.leenooks.net/mods && FILE=DBLUP10.ZIP && \ rm -rf /tmp/* # Utility BLAM - BBS List Admin Manager v2.1 with Node2BBI -RUN SOURCE_URL=https://chinwag.leenooks.net/mods && FILE=node2bbi.zip && \ +RUN SOURCE_URL=https://chinwag.leenooks.net/bbs/mystic/mods && FILE=node2bbi.zip && \ cd /tmp && \ curl -O ${SOURCE_URL}/${FILE} && \ unzip ${FILE} && \ @@ -36,7 +36,7 @@ RUN SOURCE_URL=https://chinwag.leenooks.net/mods && FILE=node2bbi.zip && \ rm -rf /tmp/* # Utility QRCODE - QR Code for Mystic BBS v1.0 -RUN SOURCE_URL=https://chinwag.leenooks.net/mods && FILE=xq-qrcode.zip && \ +RUN SOURCE_URL=https://chinwag.leenooks.net/bbs/mystic/mods && FILE=xq-qrcode.zip && \ cd /tmp && \ apt-get update && \ apt-get install --no-install-recommends -yqq qrencode && \ @@ -48,7 +48,7 @@ RUN SOURCE_URL=https://chinwag.leenooks.net/mods && FILE=xq-qrcode.zip && \ rm -rf /var/lib/apt/lists/* /tmp/* # Utility MOON - Moon Phase v? -RUN SOURCE_URL=https://chinwag.leenooks.net/mods && FILE=xq-moon.zip && \ +RUN SOURCE_URL=https://chinwag.leenooks.net/bbs/mystic/mods && FILE=xq-moon.zip && \ cd /tmp && \ curl -O ${SOURCE_URL}/${FILE} && \ unzip ${FILE} && \ @@ -60,7 +60,7 @@ RUN SOURCE_URL=https://chinwag.leenooks.net/mods && FILE=xq-moon.zip && \ rm -rf /tmp/* # Utility USERBIRTHDAYS - Today's User Birthdays v2 -RUN SOURCE_URL=https://chinwag.leenooks.net/mods && FILE=dm-birthv2.zip && \ +RUN SOURCE_URL=https://chinwag.leenooks.net/bbs/mystic/mods && FILE=dm-birthv2.zip && \ cd /tmp && \ curl -O ${SOURCE_URL}/${FILE} && \ unzip ${FILE} && \ @@ -70,7 +70,7 @@ RUN SOURCE_URL=https://chinwag.leenooks.net/mods && FILE=dm-birthv2.zip && \ rm -rf /tmp/* # Game MASTERMIND - Mystic Master Mind v2 -RUN SOURCE_URL=https://chinwag.leenooks.net/mods && FILE=dm-mm200.zip && \ +RUN SOURCE_URL=https://chinwag.leenooks.net/bbs/mystic/mods && FILE=dm-mm200.zip && \ cd /tmp && \ curl -O ${SOURCE_URL}/${FILE} && \ unzip ${FILE} && \ @@ -81,7 +81,7 @@ RUN SOURCE_URL=https://chinwag.leenooks.net/mods && FILE=dm-mm200.zip && \ rm -rf /tmp/* # Utility SYSOPAVAIL - Sysop Availablity v2.0 -RUN SOURCE_URL=https://chinwag.leenooks.net/mods && FILE=dm-op4112.zip && \ +RUN SOURCE_URL=https://chinwag.leenooks.net/bbs/mystic/mods && FILE=dm-op4112.zip && \ cd /tmp && \ curl -O ${SOURCE_URL}/${FILE} && \ unzip ${FILE} && \ @@ -91,7 +91,7 @@ RUN SOURCE_URL=https://chinwag.leenooks.net/mods && FILE=dm-op4112.zip && \ rm -rf /tmp/* # Game REVERSI - Reversi v1.1 -RUN SOURCE_URL=https://chinwag.leenooks.net/mods && FILE=gy-rvrs10.zip && \ +RUN SOURCE_URL=https://chinwag.leenooks.net/bbs/mystic/mods && FILE=gy-rvrs10.zip && \ cd /tmp && \ curl -O ${SOURCE_URL}/${FILE} && \ unzip ${FILE} && \ @@ -102,7 +102,7 @@ RUN SOURCE_URL=https://chinwag.leenooks.net/mods && FILE=gy-rvrs10.zip && \ rm -rf /tmp/* # Utility TIMEZONE - Timezone -RUN SOURCE_URL=https://chinwag.leenooks.net/mods && FILE=xq-timezone.zip && \ +RUN SOURCE_URL=https://chinwag.leenooks.net/bbs/mystic/mods && FILE=xq-timezone.zip && \ cd /tmp && \ curl -O ${SOURCE_URL}/${FILE} && \ unzip ${FILE} && \ @@ -114,9 +114,9 @@ RUN SOURCE_URL=https://chinwag.leenooks.net/mods && FILE=xq-timezone.zip && \ apt-get install --no-install-recommends -yqq python-dateutil python-tz && \ rm -rf /var/lib/apt/lists/* /tmp/* -# Game Galactic Dynasty 0.9.1-dev +# Game Galactic Dynasty RUN apt-get update \ && apt-get install --no-install-recommends --allow-unauthenticated -yqq galacticdynasty \ && rm -rf /var/lib/apt/lists/* /tmp/* \ - && cd /mystic/docs && mkdir -p doors && cp -pR /usr/local/door/galacticdynasty doors/ \ - && mv doors/galacticdynasty/linmyst.txt mod-galacticdynasty-0.9.1-linmyst.txt + && cd /mystic/docs && mkdir -p doors && cp -pR /var/door/galacticdynasty doors/ + #&& mv /usr/share/doc/galacticdynasty/linmyst.txt mod-galacticdynasty-0.9.3-linmyst.txt diff --git a/init b/init deleted file mode 100755 index 7b14f94..0000000 --- a/init +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -set -e -NAME="Mystic BBS" -INIT=mis - -function stop { - echo "Stopping ${NAME}" - kill $(ps -Af|grep ${INIT} |grep -v grep|awk '{ print $2}') -} - -trap 'stop' SIGTERM -export PATH=$PATH:/mystic - -if [ "$1" == "start" ]; then - # First time install - expand out our data directory - [ $(find data|wc -l) -le 1 ] && tar xzf data.tar.gz - - # OK, start - exec ${INIT} server - -else - exec $@ -fi