amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-09-29 09:00:29 +00:00
Code Issues Projects Releases Wiki Activity

Added procps to alpine image to resolve autopause compatibility (#1361)

Browse Source
This commit is contained in:
Geoff Bourne
2022-02-13 18:02:09 -06:00
committed by GitHub
parent 3886bca93f
commit 5d68a57910
4 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build-multiarch.yml
-6
View File
@@ -97,11 +97,6 @@ jobs:
username: ${{ secrets.DOCKER_USER }} username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
- name: Calculate build files revision
id: build-files
run: |
echo "::set-output name=REV::$(git log -1 --format=%H build)"
- name: Build for test - name: Build for test
uses: docker/build-push-action@v2.9.0 uses: docker/build-push-action@v2.9.0
with: with:
@@ -114,7 +109,6 @@ jobs:
push: false push: false
build-args: | build-args: |
BASE_IMAGE=${{ matrix.baseImage }} BASE_IMAGE=${{ matrix.baseImage }}
BUILD_FILES_REV=${{ steps.build-files.outputs.REV }}
cache-from: type=gha,scope=${{ matrix.variant }} cache-from: type=gha,scope=${{ matrix.variant }}
# no cache-to to avoid cross-cache update from next build step # no cache-to to avoid cross-cache update from next build step
README.md
+10 -9
View File
@@ -287,16 +287,17 @@ the server jar remain in the `/data` directory. It is safe to remove those._
When using the image `itzg:/minecraft-server` without a tag, the `latest` image tag is implied from the table below. To use a different version of Java, please use an alternate tag to run your Minecraft server container. When using the image `itzg:/minecraft-server` without a tag, the `latest` image tag is implied from the table below. To use a different version of Java, please use an alternate tag to run your Minecraft server container.
| Tag name | Java version | Linux | JVM Type | Architecture | | Tag name | Java version | Linux | JVM Type | Architecture |
| -------------- | -------------|--------|----------|-------------------| |-----------------|-------------|--------|----------|-------------------|
| latest | 17 | Debian | Hotspot | amd64,arm64,armv7 | | latest | 17 | Debian | Hotspot | amd64,arm64,armv7 |
| java8 | 8 | Alpine | Hotspot | amd64 | | java8 | 8 | Alpine | Hotspot | amd64 |
| java8-multiarch | 8 | Debian | Hotspot | amd64,arm64,armv7 | | java8-multiarch | 8 | Debian | Hotspot | amd64,arm64,armv7 |
| java8-openj9 | 8 | Debian | OpenJ9 | amd64 | | java8-openj9 | 8 | Debian | OpenJ9 | amd64 |
| java11 | 11 | Debian | Hotspot | amd64,arm64,armv7 | | java11 | 11 | Debian | Hotspot | amd64,arm64,armv7 |
| java11-openj9 | 11 | Debian | OpenJ9 | amd64 | | java11-openj9 | 11 | Debian | OpenJ9 | amd64 |
| java17 | 17 | Ubuntu | Hotspot | amd64,arm64,armv7 | | java17 | 17 | Ubuntu | Hotspot | amd64,arm64,armv7 |
| java17-openj9 | 17 | Debian | OpenJ9 | amd64 | | java17-openj9 | 17 | Debian | OpenJ9 | amd64 |
| java17-alpine | 17 | Alpine | Hotspot | amd64 |
For example, to use Java version 8 on any supported architecture: For example, to use Java version 8 on any supported architecture:
build/alpine/install-packages.sh
+1
View File
@@ -10,6 +10,7 @@ apk add --no-cache -U \
su-exec \ su-exec \
coreutils \ coreutils \
findutils \ findutils \
procps \
shadow \ shadow \
bash \ bash \
curl iputils \ curl iputils \
tests/setuponlytests/test.sh
+12 -5
View File
@@ -5,6 +5,16 @@ IFS=$'\n\t'
# go to script root directory # go to script root directory
cd "$(dirname "$0")" || exit 1 cd "$(dirname "$0")" || exit 1
outputContainerLog() {
logs=${1?}
echo "${folder} test scenario FAILED"
echo ":::::::::::: LOGS ::::::::::::::::
$logs
::::::::::::::::::::::::::::::::::
"
}
# tests that only run the setup files for things like downloads and configuration. # tests that only run the setup files for things like downloads and configuration.
setupOnlyMinecraftTest(){ setupOnlyMinecraftTest(){
folder=$1 folder=$1
@@ -23,15 +33,12 @@ setupOnlyMinecraftTest(){
fi fi
if ! logs=$(docker-compose run mc 2>&1); then if ! logs=$(docker-compose run mc 2>&1); then
echo "${folder} test scenario FAILED" outputContainerLog "$logs"
echo ":::::::::::: LOGS ::::::::::::::::
$logs
::::::::::::::::::::::::::::::::::
"
result=1 result=1
elif [ -f verify.sh ]; then elif [ -f verify.sh ]; then
if ! docker run --rm --entrypoint bash -v "${PWD}/data":/data -v "${PWD}/verify.sh":/verify "${IMAGE_TO_TEST:-itzg/minecraft-server}" -e /verify; then if ! docker run --rm --entrypoint bash -v "${PWD}/data":/data -v "${PWD}/verify.sh":/verify "${IMAGE_TO_TEST:-itzg/minecraft-server}" -e /verify; then
echo "${folder} verify FAILED" echo "${folder} verify FAILED"
outputContainerLog "$logs"
result=1 result=1
else else
echo "${folder} verify PASS" echo "${folder} verify PASS"