Auto-merging via docker-versions-create

.circleci/config.yml

@@ -1,16 +1,14 @@
-version: 2.1
-
+version: 2
 jobs:
   minecraft_server:
     docker:
-      - image: docker:18.09.6
-    environment:
-      DOCKER_BUILDKIT: "1"
+      - image: circleci/buildpack-deps:19.10
     steps:
       - checkout
-      - setup_remote_docker:
-          version: 18.09.3
-      - run: docker build --platform linux/amd64,linux/arm64,linux/arm/v7 -t itzg/minecraft-server:multiarch .
+      - setup_remote_docker
+      - run:
+          name: Build image
+          command: docker build -t mc:$CIRCLE_BUILD_NUM .
 
 workflows:
   version: 2

Dockerfile

@@ -1,34 +1,36 @@
-FROM ubuntu:18.04
+FROM adoptopenjdk/openjdk13:alpine-jre
 
 LABEL maintainer "itzg"
 
-RUN apt-get update \
-  && DEBIAN_FRONTEND=noninteractive \
-  apt-get install -y \
-    openjdk-8-jre-headless \
-    imagemagick \
-    gosu \
-    curl wget \
-    jq \
-    dos2unix \
-    mysql-client \
-    tzdata \
-    rsync \
-    nano \
-    && apt-get clean
+RUN apk add --no-cache -U \
+  openssl \
+  imagemagick \
+  lsof \
+  su-exec \
+  shadow \
+  bash \
+  curl iputils wget \
+  git \
+  jq \
+  mysql-client \
+  tzdata \
+  rsync \
+  nano
 
 HEALTHCHECK --start-period=1m CMD mc-monitor status --host localhost --port $SERVER_PORT
 
-RUN addgroup --gid 1000 minecraft \
-  && adduser --system --shell /bin/false --uid 1000 --ingroup minecraft --home /data minecraft
+RUN addgroup -g 1000 minecraft \
+  && adduser -Ss /bin/false -u 1000 -G minecraft -h /home/minecraft minecraft \
+  && mkdir -m 777 /data \
+  && chown minecraft:minecraft /data /home/minecraft
 
 EXPOSE 25565 25575
 
 # hook into docker BuildKit --platform support
 # see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
 ARG TARGETOS=linux
-ARG TARGETARCH=arm
-ARG TARGETVARIANT=v7
+ARG TARGETARCH=amd64
+ARG TARGETVARIANT=""
 
 ARG EASY_ADD_VER=0.7.1
 ADD https://github.com/itzg/easy-add/releases/download/${EASY_ADD_VER}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add

start

@@ -40,7 +40,7 @@ if [ $(id -u) = 0 ]; then
     echo 'hosts: files dns' > /etc/nsswitch.conf
   fi
 
-  exec gosu ${runAsUser}:${runAsGroup} /start-configuration $@
+  exec su-exec ${runAsUser}:${runAsGroup} /start-configuration $@
 else
   exec /start-configuration $@
 fi

start-configuration

@@ -7,8 +7,6 @@ shopt -s nullglob
 #umask 002
 export HOME=/data
 
-log "Running as uid=$(id -u) gid=$(id -g) with /data as '$(ls -lnd /data)'"
-
 if [ ! -e /data/eula.txt ]; then
   EULA="${EULA,,}"
   if [ "$EULA" != "true" ]; then
@@ -30,6 +28,15 @@ if [ ! -e /data/eula.txt ]; then
 fi
 
 
+log "Running as uid=$(id -u) gid=$(id -g) with /data as '$(ls -lnd /data)'"
+
+if ! touch /data/.verify_access; then
+  log "ERROR: /data doesn't seem to be writable. Please make sure attached directory is writable by uid=$(id -u)"
+  exit 2
+fi
+
+rm /data/.verify_access || true
+
 if [[ $PROXY ]]; then
     export http_proxy="$PROXY"
     export https_proxy="$PROXY"