meatbag/baseimage-alpine
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Pull docker-mods from repo, install jq

Browse source
This commit is contained in:
TheSpad 2022-10-05 18:05:08 +01:00
parent ced4151423
commit 533d182af5
No known key found for this signature in database
GPG key ID: 08F06191F4587860
5 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Dockerfile
View file

@ -56,9 +56,12 @@ FROM scratch
COPY --from=rootfs-stage /root-out/ / COPY --from=rootfs-stage /root-out/ /
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
ARG MODS_VERSION="v3"
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="TheLamer" LABEL maintainer="TheLamer"
ADD "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods"
# environment variables # environment variables
ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \ ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \
HOME="/root" \ HOME="/root" \
@ -74,6 +77,7 @@ RUN \
ca-certificates \ ca-certificates \
coreutils \ coreutils \
curl \ curl \
jq \
procps \ procps \
shadow \ shadow \
tzdata && \ tzdata && \
@ -85,6 +89,7 @@ RUN \
/app \ /app \
/config \ /config \
/defaults && \ /defaults && \
chmod +x /docker-mods && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
rm -rf \ rm -rf \
/tmp/* /tmp/*

5
Dockerfile.aarch64
View file

@ -56,9 +56,12 @@ FROM scratch
COPY --from=rootfs-stage /root-out/ / COPY --from=rootfs-stage /root-out/ /
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
ARG MODS_VERSION="v3"
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="TheLamer" LABEL maintainer="TheLamer"
ADD "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods"
# environment variables # environment variables
ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \ ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \
HOME="/root" \ HOME="/root" \
@ -74,6 +77,7 @@ RUN \
ca-certificates \ ca-certificates \
coreutils \ coreutils \
curl \ curl \
jq \
procps \ procps \
shadow \ shadow \
tzdata && \ tzdata && \
@ -85,6 +89,7 @@ RUN \
/app \ /app \
/config \ /config \
/defaults && \ /defaults && \
chmod +x /docker-mods && \
echo "**** add qemu ****" && \ echo "**** add qemu ****" && \
curl -o \ curl -o \
/usr/bin/qemu-aarch64-static -L \ /usr/bin/qemu-aarch64-static -L \

5
Dockerfile.armhf
View file

@ -56,9 +56,12 @@ FROM scratch
COPY --from=rootfs-stage /root-out/ / COPY --from=rootfs-stage /root-out/ /
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
ARG MODS_VERSION="v3"
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="TheLamer" LABEL maintainer="TheLamer"
ADD "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods"
# environment variables # environment variables
ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \ ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \
HOME="/root" \ HOME="/root" \
@ -74,6 +77,7 @@ RUN \
ca-certificates \ ca-certificates \
coreutils \ coreutils \
curl \ curl \
jq \
procps \ procps \
shadow \ shadow \
tzdata && \ tzdata && \
@ -85,6 +89,7 @@ RUN \
/app \ /app \
/config \ /config \
/defaults && \ /defaults && \
chmod +x /docker-mods && \
echo "**** add qemu ****" && \ echo "**** add qemu ****" && \
curl -o \ curl -o \
/usr/bin/qemu-arm-static -L \ /usr/bin/qemu-arm-static -L \

4
root/etc/s6-overlay/s6-rc.d/init-envfile/run
View file

@ -1,8 +1,8 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# shellcheck shell=bash # shellcheck shell=bash
if find /var/run/s6/container_environment/*"FILE__"* -maxdepth 1 > /dev/null 2>&1; then if find /run/s6/container_environment/*"FILE__"* -maxdepth 1 > /dev/null 2>&1; then
for FILENAME in /var/run/s6/container_environment/*; do for FILENAME in /run/s6/container_environment/*; do
if [[ "${FILENAME##*/}" == "FILE__"* ]]; then if [[ "${FILENAME##*/}" == "FILE__"* ]]; then
SECRETFILE=$(cat "${FILENAME}") SECRETFILE=$(cat "${FILENAME}")
if [[ -f ${SECRETFILE} ]]; then if [[ -f ${SECRETFILE} ]]; then

4
root/usr/bin/with-contenv
View file

@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
if [[ -f /var/run/s6/container_environment/UMASK ]] && if [[ -f /run/s6/container_environment/UMASK ]] &&
{ [[ "$(pwdx $$)" =~ "/run/s6/legacy-services/" ]] || { [[ "$(pwdx $$)" =~ "/run/s6/legacy-services/" ]] ||
[[ "$(pwdx $$)" =~ "/run/s6/services/" ]] || [[ "$(pwdx $$)" =~ "/run/s6/services/" ]] ||
[[ "$(pwdx $$)" =~ "/servicedirs/svc-" ]]; }; then [[ "$(pwdx $$)" =~ "/servicedirs/svc-" ]]; }; then
umask "$(cat /var/run/s6/container_environment/UMASK)" umask "$(cat /run/s6/container_environment/UMASK)"
fi fi
exec /command/with-contenv "$@" exec /command/with-contenv "$@"