Compare commits

...
10 Commits
7 changed files with 20 additions and 15 deletions

No files matched your search

+3 -3
View File
@@ -31,7 +31,7 @@ ADD ${GITHUB_BASEURL}/itzg/easy-add/releases/download/${EASY_ADD_VERSION}/easy-a
RUN chmod +x /usr/bin/easy-add RUN chmod +x /usr/bin/easy-add
# renovate: datasource=github-releases packageName=itzg/restify # renovate: datasource=github-releases packageName=itzg/restify
ARG RESTIFY_VERSION=1.7.12 ARG RESTIFY_VERSION=1.7.13
RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
--var version=${RESTIFY_VERSION} --var app=restify --file {{.app}} \ --var version=${RESTIFY_VERSION} --var app=restify --file {{.app}} \
--from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
@@ -43,7 +43,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
--from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
# renovate: datasource=github-releases packageName=itzg/mc-monitor # renovate: datasource=github-releases packageName=itzg/mc-monitor
ARG MC_MONITOR_VERSION=0.16.1 ARG MC_MONITOR_VERSION=0.16.2
RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
--var version=${MC_MONITOR_VERSION} --var app=mc-monitor --file {{.app}} \ --var version=${MC_MONITOR_VERSION} --var app=mc-monitor --file {{.app}} \
--from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
@@ -55,7 +55,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
--from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
# renovate: datasource=github-releases packageName=itzg/mc-image-helper versioning=loose # renovate: datasource=github-releases packageName=itzg/mc-image-helper versioning=loose
ARG MC_HELPER_VERSION=1.56.3 ARG MC_HELPER_VERSION=1.57.3
ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION} ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
# used for cache busting local copy of mc-image-helper # used for cache busting local copy of mc-image-helper
ARG MC_HELPER_REV=1 ARG MC_HELPER_REV=1
+3 -1
View File
@@ -18,6 +18,7 @@ apk add --no-cache -U \
curl \ curl \
iputils \ iputils \
git \ git \
git-lfs \
jq \ jq \
mysql-client \ mysql-client \
tzdata \ tzdata \
@@ -45,4 +46,5 @@ cat <<EOF >> /etc/gitconfig
[user] [user]
name = Minecraft Server on Docker name = Minecraft Server on Docker
email = server@example.com email = server@example.com
EOF EOF
git lfs install
+2
View File
@@ -46,6 +46,7 @@ dnf install -y \
zstd \ zstd \
$([ "$os_major_version" -ge 10 ] && echo 'bzip2' || echo 'lbzip2') \ $([ "$os_major_version" -ge 10 ] && echo 'bzip2' || echo 'lbzip2') \
libpcap \ libpcap \
libcap \
libwebp \ libwebp \
findutils \ findutils \
which \ which \
@@ -81,3 +82,4 @@ cat <<EOF >> /etc/gitconfig
name = Minecraft Server on Docker name = Minecraft Server on Docker
email = server@example.com email = server@example.com
EOF EOF
git lfs install
+3 -5
View File
@@ -16,6 +16,7 @@ apt-get install -y \
iputils-ping \ iputils-ping \
curl \ curl \
git \ git \
git-lfs \
jq \ jq \
dos2unix \ dos2unix \
mysql-client \ mysql-client \
@@ -28,13 +29,9 @@ apt-get install -y \
nfs-common \ nfs-common \
libpcap0.8 \ libpcap0.8 \
libnuma1 \ libnuma1 \
libcap2-bin \
${EXTRA_DEB_PACKAGES} ${EXTRA_DEB_PACKAGES}
# Install Git LFS
curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash
apt-get update
apt-get install -y git-lfs
# Clean up APT when done # Clean up APT when done
apt-get clean apt-get clean
@@ -51,3 +48,4 @@ cat <<EOF >> /etc/gitconfig
name = Minecraft Server on Docker name = Minecraft Server on Docker
email = server@example.com email = server@example.com
EOF EOF
git lfs install
+4 -4
View File
@@ -1,4 +1,4 @@
click==8.3.2 click==8.3.3
colorama==0.4.6 colorama==0.4.6
deepmerge==2.0 deepmerge==2.0
ghp-import==2.1.0 ghp-import==2.1.0
@@ -12,8 +12,8 @@ mkdocs-autorefs==1.4.4
mkdocs-get-deps==0.2.2 mkdocs-get-deps==0.2.2
mkdocstrings==1.0.4 mkdocstrings==1.0.4
mkdocstrings-python==2.0.3 mkdocstrings-python==2.0.3
packaging==26.1 packaging==26.2
pathspec==1.0.4 pathspec==1.1.1
platformdirs==4.9.6 platformdirs==4.9.6
Pygments==2.20.0 Pygments==2.20.0
pymdown-extensions==10.21.2 pymdown-extensions==10.21.2
@@ -22,4 +22,4 @@ PyYAML==6.0.3
pyyaml_env_tag==1.1 pyyaml_env_tag==1.1
six==1.17.0 six==1.17.0
watchdog==6.0.0 watchdog==6.0.0
zensical==0.0.34 zensical==0.0.40
+5
View File
@@ -212,6 +212,11 @@
}, },
"valhelsia-5": { "valhelsia-5": {
"excludes": ["modernfix"] "excludes": ["modernfix"]
},
"wolds-vaults": {
"forceIncludes": [
"just-enough-resources-jer"
]
} }
} }
} }
-2
View File
@@ -5,7 +5,6 @@
"AmbientSounds", "AmbientSounds",
"amecs", "amecs",
"Animation_Overhaul", "Animation_Overhaul",
"appleskin",
"auudio", "auudio",
"axolotlbuckets", "axolotlbuckets",
"BadOptimizations", "BadOptimizations",
@@ -28,7 +27,6 @@
"compass-coords", "compass-coords",
"colorwheel", "colorwheel",
"connectedness", "connectedness",
"connector",
"continuity", "continuity",
"controlling", "controlling",
"craftpresence", "craftpresence",