From 599bfba93d9ceff69eba1fda9d2c8dcb14d992ee Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 19 Jan 2022 14:31:09 -0500 Subject: [PATCH] update formatting --- Dockerfile | 215 +++++++++++++++---------------- Dockerfile.aarch64 | 215 +++++++++++++++---------------- Dockerfile.armhf | 215 +++++++++++++++---------------- root/etc/cont-init.d/30-config | 12 +- root/etc/services.d/minetest/run | 4 +- 5 files changed, 326 insertions(+), 335 deletions(-) diff --git a/Dockerfile b/Dockerfile index cf7e7d5..996bd65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,120 +9,117 @@ LABEL maintainer="aptalca" # environment variables ENV HOME="/config" \ -MINETEST_SUBGAME_PATH="/config/.minetest/games" + MINETEST_SUBGAME_PATH="/config/.minetest/games" # build variables ARG LDFLAGS="-lintl" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - bzip2-dev \ - cmake \ - curl-dev \ - doxygen \ - g++ \ - gcc \ - gettext-dev \ - git \ - gmp-dev \ - hiredis-dev \ - icu-dev \ - irrlicht-dev \ - jq \ - leveldb-dev \ - libjpeg-turbo-dev \ - libogg-dev \ - libpng-dev \ - libressl-dev \ - libtool \ - libvorbis-dev \ - luajit-dev \ - make \ - mesa-dev \ - ncurses-dev \ - openal-soft-dev \ - python3-dev \ - sqlite-dev && \ - echo "**** install runtime packages ****" && \ - apk add --no-cache \ - curl \ - gmp \ - hiredis \ - libgcc \ - libintl \ - libstdc++ \ - luajit \ - lua-socket \ - sqlite \ - sqlite-libs && \ - apk add --no-cache \ - --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \ - leveldb && \ - echo "**** compile spatialindex ****" && \ - git clone https://github.com/libspatialindex/libspatialindex /tmp/spatialindex && \ - cd /tmp/spatialindex && \ - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr && \ - make -j 2 && \ - make install && \ - echo "**** compile minetestserver ****" && \ - if [ -z ${MINETEST_RELEASE+x} ]; then \ - MINETEST_RELEASE=$(curl -sX GET "https://api.github.com/repos/minetest/minetest/releases" \ - | jq -r 'first(.[] | select(.tag_name | contains("android") | not)) | .tag_name'); \ - fi && \ - mkdir -p \ - /tmp/minetest && \ - curl -o \ - /tmp/minetest-src.tar.gz -L \ - "https://github.com/minetest/minetest/archive/${MINETEST_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/minetest-src.tar.gz -C \ - /tmp/minetest --strip-components=1 && \ - cp /tmp/minetest/minetest.conf.example /defaults/minetest.conf && \ - cd /tmp/minetest && \ - cmake . \ - -DBUILD_CLIENT=0 \ - -DBUILD_SERVER=1 \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCUSTOM_BINDIR=/usr/bin \ - -DCUSTOM_DOCDIR="/usr/share/doc/minetest" \ - -DCUSTOM_SHAREDIR="/usr/share/minetest" \ - -DENABLE_CURL=1 \ - -DENABLE_FREETYPE=1 \ - -DENABLE_GETTEXT=0 \ - -DENABLE_LEVELDB=1 \ - -DENABLE_LUAJIT=1 \ - -DENABLE_REDIS=1 \ - -DENABLE_SOUND=0 \ - -DENABLE_SYSTEM_GMP=1 \ - -DRUN_IN_PLACE=0 && \ - make -j 2 && \ - make install && \ - echo "**** copy games to temporary folder ****" && \ - mkdir -p \ - /defaults/games && \ - cp -pr /usr/share/minetest/games/* /defaults/games/ && \ - echo "**** split after 3rd dot if it exists in minetest tag variable ****" && \ - echo "**** so we fetch game version x.x.x etc ****" && \ - if \ - [ $(echo "$MINETEST_RELEASE" | tr -cd '.' | wc -c) = 3 ] ; \ - then MINETEST_RELEASE=${MINETEST_RELEASE%.*}; \ - fi && \ - echo "**** fetch additional game ****" && \ - mkdir -p \ - /defaults/games/minetest && \ - curl -o \ - /tmp/minetest-game.tar.gz -L \ - "https://github.com/minetest/minetest_game/archive/${MINETEST_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/minetest-game.tar.gz -C \ - /defaults/games/minetest --strip-components=1 && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + bzip2-dev \ + cmake \ + curl-dev \ + doxygen \ + g++ \ + gcc \ + gettext-dev \ + git \ + gmp-dev \ + hiredis-dev \ + icu-dev \ + irrlicht-dev \ + jq \ + leveldb-dev \ + libjpeg-turbo-dev \ + libogg-dev \ + libpng-dev \ + libressl-dev \ + libtool \ + libvorbis-dev \ + luajit-dev \ + make \ + mesa-dev \ + ncurses-dev \ + openal-soft-dev \ + python3-dev \ + sqlite-dev && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ + curl \ + gmp \ + hiredis \ + leveldb \ + libgcc \ + libintl \ + libstdc++ \ + luajit \ + lua-socket \ + sqlite \ + sqlite-libs && \ + echo "**** compile spatialindex ****" && \ + git clone https://github.com/libspatialindex/libspatialindex /tmp/spatialindex && \ + cd /tmp/spatialindex && \ + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr && \ + make -j 2 && \ + make install && \ + echo "**** compile minetestserver ****" && \ + if [ -z ${MINETEST_RELEASE+x} ]; then \ + MINETEST_RELEASE=$(curl -sX GET "https://api.github.com/repos/minetest/minetest/releases" \ + | jq -r 'first(.[] | select(.tag_name | contains("android") | not)) | .tag_name'); \ + fi && \ + mkdir -p \ + /tmp/minetest && \ + curl -o \ + /tmp/minetest-src.tar.gz -L \ + "https://github.com/minetest/minetest/archive/${MINETEST_RELEASE}.tar.gz" && \ + tar xf \ + /tmp/minetest-src.tar.gz -C \ + /tmp/minetest --strip-components=1 && \ + cp /tmp/minetest/minetest.conf.example /defaults/minetest.conf && \ + cd /tmp/minetest && \ + cmake . \ + -DBUILD_CLIENT=0 \ + -DBUILD_SERVER=1 \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCUSTOM_BINDIR=/usr/bin \ + -DCUSTOM_DOCDIR="/usr/share/doc/minetest" \ + -DCUSTOM_SHAREDIR="/usr/share/minetest" \ + -DENABLE_CURL=1 \ + -DENABLE_FREETYPE=1 \ + -DENABLE_GETTEXT=0 \ + -DENABLE_LEVELDB=1 \ + -DENABLE_LUAJIT=1 \ + -DENABLE_REDIS=1 \ + -DENABLE_SOUND=0 \ + -DENABLE_SYSTEM_GMP=1 \ + -DRUN_IN_PLACE=0 && \ + make -j 2 && \ + make install && \ + echo "**** copy games to temporary folder ****" && \ + mkdir -p \ + /defaults/games && \ + cp -pr /usr/share/minetest/games/* /defaults/games/ && \ + echo "**** split after 3rd dot if it exists in minetest tag variable ****" && \ + echo "**** so we fetch game version x.x.x etc ****" && \ + if [ $(echo "$MINETEST_RELEASE" | tr -cd '.' | wc -c) = 3 ]; then \ + MINETEST_RELEASE=${MINETEST_RELEASE%.*}; \ + fi && \ + echo "**** fetch additional game ****" && \ + mkdir -p \ + /defaults/games/minetest && \ + curl -o \ + /tmp/minetest-game.tar.gz -L \ + "https://github.com/minetest/minetest_game/archive/${MINETEST_RELEASE}.tar.gz" && \ + tar xf \ + /tmp/minetest-game.tar.gz -C \ + /defaults/games/minetest --strip-components=1 && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /tmp/* # add local files COPY root / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c49e23a..2c9f82a 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -9,120 +9,117 @@ LABEL maintainer="aptalca" # environment variables ENV HOME="/config" \ -MINETEST_SUBGAME_PATH="/config/.minetest/games" + MINETEST_SUBGAME_PATH="/config/.minetest/games" # build variables ARG LDFLAGS="-lintl" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - bzip2-dev \ - cmake \ - curl-dev \ - doxygen \ - g++ \ - gcc \ - gettext-dev \ - git \ - gmp-dev \ - hiredis-dev \ - icu-dev \ - irrlicht-dev \ - jq \ - leveldb-dev \ - libjpeg-turbo-dev \ - libogg-dev \ - libpng-dev \ - libressl-dev \ - libtool \ - libvorbis-dev \ - luajit-dev \ - make \ - mesa-dev \ - ncurses-dev \ - openal-soft-dev \ - python3-dev \ - sqlite-dev && \ - echo "**** install runtime packages ****" && \ - apk add --no-cache \ - curl \ - gmp \ - hiredis \ - libgcc \ - libintl \ - libstdc++ \ - luajit \ - lua-socket \ - sqlite \ - sqlite-libs && \ - apk add --no-cache \ - --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \ - leveldb && \ - echo "**** compile spatialindex ****" && \ - git clone https://github.com/libspatialindex/libspatialindex /tmp/spatialindex && \ - cd /tmp/spatialindex && \ - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr && \ - make -j 2 && \ - make install && \ - echo "**** compile minetestserver ****" && \ - if [ -z ${MINETEST_RELEASE+x} ]; then \ - MINETEST_RELEASE=$(curl -sX GET "https://api.github.com/repos/minetest/minetest/releases" \ - | jq -r 'first(.[] | select(.tag_name | contains("android") | not)) | .tag_name'); \ - fi && \ - mkdir -p \ - /tmp/minetest && \ - curl -o \ - /tmp/minetest-src.tar.gz -L \ - "https://github.com/minetest/minetest/archive/${MINETEST_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/minetest-src.tar.gz -C \ - /tmp/minetest --strip-components=1 && \ - cp /tmp/minetest/minetest.conf.example /defaults/minetest.conf && \ - cd /tmp/minetest && \ - cmake . \ - -DBUILD_CLIENT=0 \ - -DBUILD_SERVER=1 \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCUSTOM_BINDIR=/usr/bin \ - -DCUSTOM_DOCDIR="/usr/share/doc/minetest" \ - -DCUSTOM_SHAREDIR="/usr/share/minetest" \ - -DENABLE_CURL=1 \ - -DENABLE_FREETYPE=1 \ - -DENABLE_GETTEXT=0 \ - -DENABLE_LEVELDB=1 \ - -DENABLE_LUAJIT=1 \ - -DENABLE_REDIS=1 \ - -DENABLE_SOUND=0 \ - -DENABLE_SYSTEM_GMP=1 \ - -DRUN_IN_PLACE=0 && \ - make -j 2 && \ - make install && \ - echo "**** copy games to temporary folder ****" && \ - mkdir -p \ - /defaults/games && \ - cp -pr /usr/share/minetest/games/* /defaults/games/ && \ - echo "**** split after 3rd dot if it exists in minetest tag variable ****" && \ - echo "**** so we fetch game version x.x.x etc ****" && \ - if \ - [ $(echo "$MINETEST_RELEASE" | tr -cd '.' | wc -c) = 3 ] ; \ - then MINETEST_RELEASE=${MINETEST_RELEASE%.*}; \ - fi && \ - echo "**** fetch additional game ****" && \ - mkdir -p \ - /defaults/games/minetest && \ - curl -o \ - /tmp/minetest-game.tar.gz -L \ - "https://github.com/minetest/minetest_game/archive/${MINETEST_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/minetest-game.tar.gz -C \ - /defaults/games/minetest --strip-components=1 && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + bzip2-dev \ + cmake \ + curl-dev \ + doxygen \ + g++ \ + gcc \ + gettext-dev \ + git \ + gmp-dev \ + hiredis-dev \ + icu-dev \ + irrlicht-dev \ + jq \ + leveldb-dev \ + libjpeg-turbo-dev \ + libogg-dev \ + libpng-dev \ + libressl-dev \ + libtool \ + libvorbis-dev \ + luajit-dev \ + make \ + mesa-dev \ + ncurses-dev \ + openal-soft-dev \ + python3-dev \ + sqlite-dev && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ + curl \ + gmp \ + hiredis \ + leveldb \ + libgcc \ + libintl \ + libstdc++ \ + luajit \ + lua-socket \ + sqlite \ + sqlite-libs && \ + echo "**** compile spatialindex ****" && \ + git clone https://github.com/libspatialindex/libspatialindex /tmp/spatialindex && \ + cd /tmp/spatialindex && \ + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr && \ + make -j 2 && \ + make install && \ + echo "**** compile minetestserver ****" && \ + if [ -z ${MINETEST_RELEASE+x} ]; then \ + MINETEST_RELEASE=$(curl -sX GET "https://api.github.com/repos/minetest/minetest/releases" \ + | jq -r 'first(.[] | select(.tag_name | contains("android") | not)) | .tag_name'); \ + fi && \ + mkdir -p \ + /tmp/minetest && \ + curl -o \ + /tmp/minetest-src.tar.gz -L \ + "https://github.com/minetest/minetest/archive/${MINETEST_RELEASE}.tar.gz" && \ + tar xf \ + /tmp/minetest-src.tar.gz -C \ + /tmp/minetest --strip-components=1 && \ + cp /tmp/minetest/minetest.conf.example /defaults/minetest.conf && \ + cd /tmp/minetest && \ + cmake . \ + -DBUILD_CLIENT=0 \ + -DBUILD_SERVER=1 \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCUSTOM_BINDIR=/usr/bin \ + -DCUSTOM_DOCDIR="/usr/share/doc/minetest" \ + -DCUSTOM_SHAREDIR="/usr/share/minetest" \ + -DENABLE_CURL=1 \ + -DENABLE_FREETYPE=1 \ + -DENABLE_GETTEXT=0 \ + -DENABLE_LEVELDB=1 \ + -DENABLE_LUAJIT=1 \ + -DENABLE_REDIS=1 \ + -DENABLE_SOUND=0 \ + -DENABLE_SYSTEM_GMP=1 \ + -DRUN_IN_PLACE=0 && \ + make -j 2 && \ + make install && \ + echo "**** copy games to temporary folder ****" && \ + mkdir -p \ + /defaults/games && \ + cp -pr /usr/share/minetest/games/* /defaults/games/ && \ + echo "**** split after 3rd dot if it exists in minetest tag variable ****" && \ + echo "**** so we fetch game version x.x.x etc ****" && \ + if [ $(echo "$MINETEST_RELEASE" | tr -cd '.' | wc -c) = 3 ]; then \ + MINETEST_RELEASE=${MINETEST_RELEASE%.*}; \ + fi && \ + echo "**** fetch additional game ****" && \ + mkdir -p \ + /defaults/games/minetest && \ + curl -o \ + /tmp/minetest-game.tar.gz -L \ + "https://github.com/minetest/minetest_game/archive/${MINETEST_RELEASE}.tar.gz" && \ + tar xf \ + /tmp/minetest-game.tar.gz -C \ + /defaults/games/minetest --strip-components=1 && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /tmp/* # add local files COPY root / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 10a9398..76f1459 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -9,120 +9,117 @@ LABEL maintainer="aptalca" # environment variables ENV HOME="/config" \ -MINETEST_SUBGAME_PATH="/config/.minetest/games" + MINETEST_SUBGAME_PATH="/config/.minetest/games" # build variables ARG LDFLAGS="-lintl" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - bzip2-dev \ - cmake \ - curl-dev \ - doxygen \ - g++ \ - gcc \ - gettext-dev \ - git \ - gmp-dev \ - hiredis-dev \ - icu-dev \ - irrlicht-dev \ - jq \ - leveldb-dev \ - libjpeg-turbo-dev \ - libogg-dev \ - libpng-dev \ - libressl-dev \ - libtool \ - libvorbis-dev \ - luajit-dev \ - make \ - mesa-dev \ - ncurses-dev \ - openal-soft-dev \ - python3-dev \ - sqlite-dev && \ - echo "**** install runtime packages ****" && \ - apk add --no-cache \ - curl \ - gmp \ - hiredis \ - libgcc \ - libintl \ - libstdc++ \ - luajit \ - lua-socket \ - sqlite \ - sqlite-libs && \ - apk add --no-cache \ - --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \ - leveldb && \ - echo "**** compile spatialindex ****" && \ - git clone https://github.com/libspatialindex/libspatialindex /tmp/spatialindex && \ - cd /tmp/spatialindex && \ - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr && \ - make -j 2 && \ - make install && \ - echo "**** compile minetestserver ****" && \ - if [ -z ${MINETEST_RELEASE+x} ]; then \ - MINETEST_RELEASE=$(curl -sX GET "https://api.github.com/repos/minetest/minetest/releases" \ - | jq -r 'first(.[] | select(.tag_name | contains("android") | not)) | .tag_name'); \ - fi && \ - mkdir -p \ - /tmp/minetest && \ - curl -o \ - /tmp/minetest-src.tar.gz -L \ - "https://github.com/minetest/minetest/archive/${MINETEST_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/minetest-src.tar.gz -C \ - /tmp/minetest --strip-components=1 && \ - cp /tmp/minetest/minetest.conf.example /defaults/minetest.conf && \ - cd /tmp/minetest && \ - cmake . \ - -DBUILD_CLIENT=0 \ - -DBUILD_SERVER=1 \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCUSTOM_BINDIR=/usr/bin \ - -DCUSTOM_DOCDIR="/usr/share/doc/minetest" \ - -DCUSTOM_SHAREDIR="/usr/share/minetest" \ - -DENABLE_CURL=1 \ - -DENABLE_FREETYPE=1 \ - -DENABLE_GETTEXT=0 \ - -DENABLE_LEVELDB=1 \ - -DENABLE_LUAJIT=1 \ - -DENABLE_REDIS=1 \ - -DENABLE_SOUND=0 \ - -DENABLE_SYSTEM_GMP=1 \ - -DRUN_IN_PLACE=0 && \ - make -j 2 && \ - make install && \ - echo "**** copy games to temporary folder ****" && \ - mkdir -p \ - /defaults/games && \ - cp -pr /usr/share/minetest/games/* /defaults/games/ && \ - echo "**** split after 3rd dot if it exists in minetest tag variable ****" && \ - echo "**** so we fetch game version x.x.x etc ****" && \ - if \ - [ $(echo "$MINETEST_RELEASE" | tr -cd '.' | wc -c) = 3 ] ; \ - then MINETEST_RELEASE=${MINETEST_RELEASE%.*}; \ - fi && \ - echo "**** fetch additional game ****" && \ - mkdir -p \ - /defaults/games/minetest && \ - curl -o \ - /tmp/minetest-game.tar.gz -L \ - "https://github.com/minetest/minetest_game/archive/${MINETEST_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/minetest-game.tar.gz -C \ - /defaults/games/minetest --strip-components=1 && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + bzip2-dev \ + cmake \ + curl-dev \ + doxygen \ + g++ \ + gcc \ + gettext-dev \ + git \ + gmp-dev \ + hiredis-dev \ + icu-dev \ + irrlicht-dev \ + jq \ + leveldb-dev \ + libjpeg-turbo-dev \ + libogg-dev \ + libpng-dev \ + libressl-dev \ + libtool \ + libvorbis-dev \ + luajit-dev \ + make \ + mesa-dev \ + ncurses-dev \ + openal-soft-dev \ + python3-dev \ + sqlite-dev && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ + curl \ + gmp \ + hiredis \ + leveldb \ + libgcc \ + libintl \ + libstdc++ \ + luajit \ + lua-socket \ + sqlite \ + sqlite-libs && \ + echo "**** compile spatialindex ****" && \ + git clone https://github.com/libspatialindex/libspatialindex /tmp/spatialindex && \ + cd /tmp/spatialindex && \ + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr && \ + make -j 2 && \ + make install && \ + echo "**** compile minetestserver ****" && \ + if [ -z ${MINETEST_RELEASE+x} ]; then \ + MINETEST_RELEASE=$(curl -sX GET "https://api.github.com/repos/minetest/minetest/releases" \ + | jq -r 'first(.[] | select(.tag_name | contains("android") | not)) | .tag_name'); \ + fi && \ + mkdir -p \ + /tmp/minetest && \ + curl -o \ + /tmp/minetest-src.tar.gz -L \ + "https://github.com/minetest/minetest/archive/${MINETEST_RELEASE}.tar.gz" && \ + tar xf \ + /tmp/minetest-src.tar.gz -C \ + /tmp/minetest --strip-components=1 && \ + cp /tmp/minetest/minetest.conf.example /defaults/minetest.conf && \ + cd /tmp/minetest && \ + cmake . \ + -DBUILD_CLIENT=0 \ + -DBUILD_SERVER=1 \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCUSTOM_BINDIR=/usr/bin \ + -DCUSTOM_DOCDIR="/usr/share/doc/minetest" \ + -DCUSTOM_SHAREDIR="/usr/share/minetest" \ + -DENABLE_CURL=1 \ + -DENABLE_FREETYPE=1 \ + -DENABLE_GETTEXT=0 \ + -DENABLE_LEVELDB=1 \ + -DENABLE_LUAJIT=1 \ + -DENABLE_REDIS=1 \ + -DENABLE_SOUND=0 \ + -DENABLE_SYSTEM_GMP=1 \ + -DRUN_IN_PLACE=0 && \ + make -j 2 && \ + make install && \ + echo "**** copy games to temporary folder ****" && \ + mkdir -p \ + /defaults/games && \ + cp -pr /usr/share/minetest/games/* /defaults/games/ && \ + echo "**** split after 3rd dot if it exists in minetest tag variable ****" && \ + echo "**** so we fetch game version x.x.x etc ****" && \ + if [ $(echo "$MINETEST_RELEASE" | tr -cd '.' | wc -c) = 3 ]; then \ + MINETEST_RELEASE=${MINETEST_RELEASE%.*}; \ + fi && \ + echo "**** fetch additional game ****" && \ + mkdir -p \ + /defaults/games/minetest && \ + curl -o \ + /tmp/minetest-game.tar.gz -L \ + "https://github.com/minetest/minetest_game/archive/${MINETEST_RELEASE}.tar.gz" && \ + tar xf \ + /tmp/minetest-game.tar.gz -C \ + /defaults/games/minetest --strip-components=1 && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /tmp/* # add local files COPY root / diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config index bef8dab..85c49d3 100644 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/cont-init.d/30-config @@ -2,18 +2,18 @@ # make our folders mkdir -p \ - /config/.minetest/games \ - /config/.minetest/mods \ - /config/.minetest/main-config + /config/.minetest/games \ + /config/.minetest/mods \ + /config/.minetest/main-config if [ ! -f "/config/.minetest/main-config/minetest.conf" ]; then -cp /defaults/minetest.conf /config/.minetest/main-config/minetest.conf + cp /defaults/minetest.conf /config/.minetest/main-config/minetest.conf fi if [ ! -d "/config/.minetest/games/minimal" ]; then -cp -pr /defaults/games/* /config/.minetest/games/ + cp -pr /defaults/games/* /config/.minetest/games/ fi # permissions chown -R abc:abc \ - /config + /config diff --git a/root/etc/services.d/minetest/run b/root/etc/services.d/minetest/run index 5865d2a..b842bc6 100644 --- a/root/etc/services.d/minetest/run +++ b/root/etc/services.d/minetest/run @@ -1,5 +1,5 @@ #!/usr/bin/with-contenv bash exec \ - s6-setuidgid abc minetestserver ${CLI_ARGS} \ - --config /config/.minetest/main-config/minetest.conf --port 30000 + s6-setuidgid abc minetestserver ${CLI_ARGS} \ + --config /config/.minetest/main-config/minetest.conf --port 30000