From 5782b033f0e886093080caf42743ab98320756c9 Mon Sep 17 00:00:00 2001 From: Matthew Kobayashi <1856537+MattKobayashi@users.noreply.github.com> Date: Sat, 28 Sep 2024 18:10:25 +1000 Subject: [PATCH] Remove `s6-overlay` and install `supercronic` APK (#291) --- avahi/Dockerfile | 3 +- certbot-cloudflare/Dockerfile | 17 +-------- certbot-cloudflare/entrypoint.sh | 2 +- fullbogons/Dockerfile | 24 ++----------- fullbogons/entrypoint.sh | 2 +- growatt-ev/Dockerfile | 3 +- influx/Dockerfile | 2 +- iperf2/Dockerfile | 4 +-- iperf3/Dockerfile | 6 ++-- irrd/Dockerfile | 1 - irrexplorer/Dockerfile | 1 - mdns-reflector/Dockerfile | 21 ++--------- .../svc-mdns-reflector/dependencies.d/base | 0 .../s6-rc.d/svc-mdns-reflector/finish | 9 ----- mdns-reflector/s6-rc.d/svc-mdns-reflector/run | 2 -- .../s6-rc.d/svc-mdns-reflector/type | 1 - mdns-reflector/s6-rc.d/svc-mdns-reflector/up | 0 .../user/contents.d/svc-mdns-reflector | 0 oxidized/Dockerfile | 3 +- rng-tools/Dockerfile | 3 +- speedtest/Dockerfile | 19 +--------- .../init-speedtest/dependencies.d/base | 0 speedtest/s6-rc.d/init-speedtest/type | 1 - speedtest/s6-rc.d/init-speedtest/up | 2 -- .../s6-rc.d/user/contents.d/init-speedtest | 0 speedtest/speedtest.sh | 2 -- stun/Dockerfile | 4 +-- telegraf/Dockerfile | 7 +--- .../s6-rc.d/svc-telegraf/dependencies.d/base | 0 telegraf/s6-rc.d/svc-telegraf/finish | 9 ----- telegraf/s6-rc.d/svc-telegraf/run | 3 -- telegraf/s6-rc.d/svc-telegraf/type | 1 - telegraf/s6-rc.d/svc-telegraf/up | 0 .../user/contents.d/svc-mdns-reflector | 0 vyos-release-alert/Dockerfile | 5 ++- xteve/Dockerfile | 18 ++-------- xteve/s6-rc.d/svc-xteve/dependencies.d/base | 0 xteve/s6-rc.d/svc-xteve/finish | 9 ----- xteve/s6-rc.d/svc-xteve/run | 36 ------------------- xteve/s6-rc.d/svc-xteve/type | 1 - xteve/s6-rc.d/svc-xteve/up | 0 xteve/s6-rc.d/user/contents.d/svc-xteve | 0 yancobat/Dockerfile | 17 +-------- yancobat/entrypoint.sh | 2 +- 44 files changed, 25 insertions(+), 215 deletions(-) delete mode 100644 mdns-reflector/s6-rc.d/svc-mdns-reflector/dependencies.d/base delete mode 100755 mdns-reflector/s6-rc.d/svc-mdns-reflector/finish delete mode 100755 mdns-reflector/s6-rc.d/svc-mdns-reflector/run delete mode 100644 mdns-reflector/s6-rc.d/svc-mdns-reflector/type delete mode 100644 mdns-reflector/s6-rc.d/svc-mdns-reflector/up delete mode 100644 mdns-reflector/s6-rc.d/user/contents.d/svc-mdns-reflector delete mode 100644 speedtest/s6-rc.d/init-speedtest/dependencies.d/base delete mode 100644 speedtest/s6-rc.d/init-speedtest/type delete mode 100644 speedtest/s6-rc.d/init-speedtest/up delete mode 100644 speedtest/s6-rc.d/user/contents.d/init-speedtest delete mode 100755 speedtest/speedtest.sh delete mode 100644 telegraf/s6-rc.d/svc-telegraf/dependencies.d/base delete mode 100755 telegraf/s6-rc.d/svc-telegraf/finish delete mode 100755 telegraf/s6-rc.d/svc-telegraf/run delete mode 100644 telegraf/s6-rc.d/svc-telegraf/type delete mode 100644 telegraf/s6-rc.d/svc-telegraf/up delete mode 100644 telegraf/s6-rc.d/user/contents.d/svc-mdns-reflector delete mode 100644 xteve/s6-rc.d/svc-xteve/dependencies.d/base delete mode 100755 xteve/s6-rc.d/svc-xteve/finish delete mode 100755 xteve/s6-rc.d/svc-xteve/run delete mode 100644 xteve/s6-rc.d/svc-xteve/type delete mode 100644 xteve/s6-rc.d/svc-xteve/up delete mode 100644 xteve/s6-rc.d/user/contents.d/svc-xteve diff --git a/avahi/Dockerfile b/avahi/Dockerfile index 63a1e8a..98e4110 100644 --- a/avahi/Dockerfile +++ b/avahi/Dockerfile @@ -1,6 +1,5 @@ FROM alpine:3.20.3 -RUN apk --no-cache upgrade \ - && apk add --update --no-cache avahi augeas +RUN apk --no-cache add avahi augeas RUN mkdir /opt/avahi COPY entrypoint.sh /opt/avahi/ diff --git a/certbot-cloudflare/Dockerfile b/certbot-cloudflare/Dockerfile index f39ae8c..2928e3b 100644 --- a/certbot-cloudflare/Dockerfile +++ b/certbot-cloudflare/Dockerfile @@ -1,21 +1,6 @@ FROM certbot/dns-cloudflare:v2.11.0 -ARG TARGETPLATFORM -ENV SUPERCRONIC_SHA1SUM_amd64=cd48d45c4b10f3f0bfdd3a57d054cd05ac96812b \ - SUPERCRONIC_SHA1SUM_arm=75e065bf0909f920b06d5bd797c0e6b31e68b112 \ - SUPERCRONIC_SHA1SUM_arm64=512f6736450c56555e01b363144c3c9d23abed4c \ - SUPERCRONIC_SHA1SUM_i386=3436985298ce241d7d9477eb9eab164b582717a8 \ - SUPERCRONIC_VERSION=v0.2.29 - -RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCH=amd64; elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then ARCH=arm; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCH=arm64; elif [ "$TARGETPLATFORM" = "linux/i386" ]; then ARCH=i386; else exit 1; fi \ - && export SUPERCRONIC="supercronic-linux-${ARCH}" \ - && export SUPERCRONIC_URL="https://github.com/aptible/supercronic/releases/download/${SUPERCRONIC_VERSION}/${SUPERCRONIC}" \ - && wget "$SUPERCRONIC_URL" \ - && eval SUPERCRONIC_SHA1SUM='$SUPERCRONIC_SHA1SUM_'$ARCH \ - && echo "${SUPERCRONIC_SHA1SUM} ${SUPERCRONIC}" | sha1sum -c - \ - && chmod +x "${SUPERCRONIC}" \ - && mv "$SUPERCRONIC" "/usr/local/bin/${SUPERCRONIC}" \ - && ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic \ +RUN apk --no-cache add supercronic \ && mkdir /crontab/ \ && mkdir /opt/certs/ diff --git a/certbot-cloudflare/entrypoint.sh b/certbot-cloudflare/entrypoint.sh index 9807da7..9fab0c7 100644 --- a/certbot-cloudflare/entrypoint.sh +++ b/certbot-cloudflare/entrypoint.sh @@ -12,4 +12,4 @@ domain = $DOMAIN email = $EMAIL EOF -exec supercronic /crontab/certbot-cron +exec /usr/bin/supercronic /crontab/certbot-cron diff --git a/fullbogons/Dockerfile b/fullbogons/Dockerfile index c6d49cc..5a5d7a4 100644 --- a/fullbogons/Dockerfile +++ b/fullbogons/Dockerfile @@ -1,25 +1,6 @@ FROM alpine:3.20.3 -# Set supercronic environment variables -ARG TARGETPLATFORM -ENV SUPERCRONIC_SHA1SUM_amd64=cd48d45c4b10f3f0bfdd3a57d054cd05ac96812b \ - SUPERCRONIC_SHA1SUM_arm=75e065bf0909f920b06d5bd797c0e6b31e68b112 \ - SUPERCRONIC_SHA1SUM_arm64=512f6736450c56555e01b363144c3c9d23abed4c \ - SUPERCRONIC_SHA1SUM_i386=3436985298ce241d7d9477eb9eab164b582717a8 \ - SUPERCRONIC_VERSION=v0.2.29 - -# Install supercronic -WORKDIR /supercronic - -RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCH=amd64; elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then ARCH=arm; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCH=arm64; elif [ "$TARGETPLATFORM" = "linux/i386" ]; then ARCH=i386; else exit 1; fi \ - && export SUPERCRONIC="supercronic-linux-${ARCH}" \ - && export SUPERCRONIC_URL="https://github.com/aptible/supercronic/releases/download/${SUPERCRONIC_VERSION}/${SUPERCRONIC}" \ - && wget "$SUPERCRONIC_URL" \ - && eval SUPERCRONIC_SHA1SUM='$SUPERCRONIC_SHA1SUM_'$ARCH \ - && echo "${SUPERCRONIC_SHA1SUM} ${SUPERCRONIC}" | sha1sum -c - \ - && chmod +x "${SUPERCRONIC}" \ - && mv "$SUPERCRONIC" "/usr/local/bin/${SUPERCRONIC}" \ - && ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic +RUN apk --no-cache add supercronic # Set BIRD environment variables ENV SOURCE_FILE=bird.tar.gz \ @@ -28,8 +9,7 @@ ENV SOURCE_FILE=bird.tar.gz \ # Install BIRD WORKDIR /bird -RUN apk --no-cache upgrade \ - && apk --no-cache add tar build-base autoconf flex bison linux-headers ncurses-dev libssh-dev readline-dev \ +RUN apk --no-cache add tar build-base autoconf flex bison linux-headers ncurses-dev libssh-dev readline-dev \ && wget -O "$SOURCE_FILE" "$SOURCE_URL" \ && echo "${SOURCE_SHA1SUM} ${SOURCE_FILE}" | sha1sum -c - \ && tar -xz --strip-components=1 --file="$SOURCE_FILE" \ diff --git a/fullbogons/entrypoint.sh b/fullbogons/entrypoint.sh index d27e912..adec1c9 100755 --- a/fullbogons/entrypoint.sh +++ b/fullbogons/entrypoint.sh @@ -10,5 +10,5 @@ cleanup() { trap 'cleanup; exit 130' INT trap 'cleanup; exit 143' TERM -supercronic /bird/crontab/fullbogons-cron & +/usr/bin/supercronic /bird/crontab/fullbogons-cron & bird -u bird -c bird.conf -d & wait $! diff --git a/growatt-ev/Dockerfile b/growatt-ev/Dockerfile index fc90047..413b2b2 100644 --- a/growatt-ev/Dockerfile +++ b/growatt-ev/Dockerfile @@ -2,8 +2,7 @@ FROM python:3.12.6-alpine3.20 WORKDIR /opt/growatt-ev/ -RUN apk --no-cache upgrade \ - && adduser --system growatt-ev \ +RUN adduser --system growatt-ev \ && python3 -m pip install --break-system-packages paho-mqtt tuya-connector-python COPY --chown=growatt-ev main.py main.py diff --git a/influx/Dockerfile b/influx/Dockerfile index fd58acc..535d8c9 100644 --- a/influx/Dockerfile +++ b/influx/Dockerfile @@ -12,7 +12,7 @@ ADD https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VE ADD https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz.asc /tmp/ # Verify downloaded binaries -RUN apk add gpg gpg-agent \ +RUN apk --no-cache add gpg gpg-agent \ && curl -s https://repos.influxdata.com/influxdata-archive_compat.key | gpg --import - \ && gpg --verify /tmp/influxdb2-${INFLUX_DB_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz.asc /tmp/influxdb2-${INFLUX_DB_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz \ && gpg --verify /tmp/influxdb2-${INFLUX_CLI_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz.asc /tmp/influxdb2-${INFLUX_CLI_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz \ diff --git a/iperf2/Dockerfile b/iperf2/Dockerfile index b6e70a9..6b6f9c8 100644 --- a/iperf2/Dockerfile +++ b/iperf2/Dockerfile @@ -6,8 +6,7 @@ ENV SOURCE_FILE=iperf2.tar.gz \ # Download source file, extract and compile WORKDIR /iperf2 -RUN apk --no-cache upgrade \ - && apk --no-cache add tar build-base \ +RUN apk --no-cache add tar build-base \ && wget -O "$SOURCE_FILE" "$SOURCE_URL" \ && echo "${SOURCE_SHA1SUM} ${SOURCE_FILE}" | sha1sum -c - \ && tar -xz --strip-components=1 --file="$SOURCE_FILE" \ @@ -19,7 +18,6 @@ FROM alpine:3.20.3 # Copy relevant compiled files to distribution image RUN adduser --system iperf2 \ - && apk --no-cache upgrade \ && apk --no-cache add libgcc libstdc++ COPY --from=buildenv /usr/local/bin/ /usr/local/bin/ COPY --from=buildenv /usr/local/share/man/ /usr/local/share/man/ diff --git a/iperf3/Dockerfile b/iperf3/Dockerfile index 86dc0bd..d9f80fc 100644 --- a/iperf3/Dockerfile +++ b/iperf3/Dockerfile @@ -6,8 +6,7 @@ ENV SOURCE_FILE=iperf3.tar.gz \ # Download source file, extract and compile WORKDIR /iperf3 -RUN apk --no-cache upgrade \ - && apk --no-cache add tar build-base \ +RUN apk --no-cache add tar build-base \ && wget -O "$SOURCE_FILE" "$SOURCE_URL" \ && echo "${SOURCE_SHA1SUM} ${SOURCE_FILE}" | sha1sum -c - \ && tar -xz --strip-components=1 --file="$SOURCE_FILE" \ @@ -19,8 +18,7 @@ FROM alpine:3.20.3 # Copy relevant compiled files to distribution image RUN adduser --system iperf3 \ - && ldconfig -n /usr/local/lib \ - && apk --no-cache upgrade + && ldconfig -n /usr/local/lib COPY --from=buildenv /usr/local/lib/ /usr/local/lib/ COPY --from=buildenv /usr/local/bin/ /usr/local/bin/ COPY --from=buildenv /usr/local/include/ /usr/local/include/ diff --git a/irrd/Dockerfile b/irrd/Dockerfile index 72547ac..e85113b 100644 --- a/irrd/Dockerfile +++ b/irrd/Dockerfile @@ -2,7 +2,6 @@ FROM python:3.12-slim-bookworm # Install xz RUN apt-get update \ - && apt-get --yes upgrade \ && apt-get --yes install xz-utils # Add s6-overlay diff --git a/irrexplorer/Dockerfile b/irrexplorer/Dockerfile index 987e191..b51c88f 100644 --- a/irrexplorer/Dockerfile +++ b/irrexplorer/Dockerfile @@ -1,7 +1,6 @@ FROM python:3.12.6-alpine3.20 RUN adduser --system irrexplorer \ - && apk --no-cache upgrade \ && apk --no-cache add tar build-base python3-dev poetry npm yarn USER irrexplorer diff --git a/mdns-reflector/Dockerfile b/mdns-reflector/Dockerfile index 0cea80d..46157b8 100644 --- a/mdns-reflector/Dockerfile +++ b/mdns-reflector/Dockerfile @@ -6,8 +6,7 @@ ENV SOURCE_FILE=mdns-reflector.tar.gz \ # Download source file, extract and compile WORKDIR /mdns-reflector -RUN apk --no-cache upgrade \ - && apk --no-cache add tar build-base cmake \ +RUN apk --no-cache add tar build-base cmake \ && wget -O "$SOURCE_FILE" "$SOURCE_URL" \ && echo "${SOURCE_SHA1SUM} ${SOURCE_FILE}" | sha1sum -c - \ && tar -xz --strip-components=1 --file="$SOURCE_FILE" \ @@ -18,28 +17,14 @@ RUN apk --no-cache upgrade \ FROM alpine:3.20.3 -# Add s6-overlay -WORKDIR /tmp -ENV S6_OVERLAY_VERSION=3.2.0.0 -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz.sha256 /tmp -RUN echo "$(cat s6-overlay-noarch.tar.xz.sha256)" | sha256sum -c - \ - && tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz /tmp -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz.sha256 /tmp -RUN echo "$(cat s6-overlay-x86_64.tar.xz.sha256)" | sha256sum -c - \ - && tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz -COPY s6-rc.d/ /etc/s6-overlay/s6-rc.d/ - # Copy relevant compiled files to distribution image -RUN adduser --system mdns-reflector \ - && apk --no-cache upgrade +RUN adduser --system mdns-reflector COPY --from=buildenv /usr/local/bin/ /usr/local/bin/ # Switch to non-root user USER mdns-reflector # Set entrypoint -ENTRYPOINT ["/init"] +ENTRYPOINT ["mdns-reflector"] LABEL org.opencontainers.image.authors="MattKobayashi " diff --git a/mdns-reflector/s6-rc.d/svc-mdns-reflector/dependencies.d/base b/mdns-reflector/s6-rc.d/svc-mdns-reflector/dependencies.d/base deleted file mode 100644 index e69de29..0000000 diff --git a/mdns-reflector/s6-rc.d/svc-mdns-reflector/finish b/mdns-reflector/s6-rc.d/svc-mdns-reflector/finish deleted file mode 100755 index 6a0f8b2..0000000 --- a/mdns-reflector/s6-rc.d/svc-mdns-reflector/finish +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env sh - -if test "$1" -eq 256 ; then - e=$((128 + $2)) -else - e="$1" -fi - -echo "$e" > /run/s6-linux-init-container-results/exitcode diff --git a/mdns-reflector/s6-rc.d/svc-mdns-reflector/run b/mdns-reflector/s6-rc.d/svc-mdns-reflector/run deleted file mode 100755 index edfe448..0000000 --- a/mdns-reflector/s6-rc.d/svc-mdns-reflector/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env sh -exec mdns-reflector diff --git a/mdns-reflector/s6-rc.d/svc-mdns-reflector/type b/mdns-reflector/s6-rc.d/svc-mdns-reflector/type deleted file mode 100644 index 5883cff..0000000 --- a/mdns-reflector/s6-rc.d/svc-mdns-reflector/type +++ /dev/null @@ -1 +0,0 @@ -longrun diff --git a/mdns-reflector/s6-rc.d/svc-mdns-reflector/up b/mdns-reflector/s6-rc.d/svc-mdns-reflector/up deleted file mode 100644 index e69de29..0000000 diff --git a/mdns-reflector/s6-rc.d/user/contents.d/svc-mdns-reflector b/mdns-reflector/s6-rc.d/user/contents.d/svc-mdns-reflector deleted file mode 100644 index e69de29..0000000 diff --git a/oxidized/Dockerfile b/oxidized/Dockerfile index acec421..37e8fad 100644 --- a/oxidized/Dockerfile +++ b/oxidized/Dockerfile @@ -7,8 +7,7 @@ ENV SOURCE_FILE=oxidized.tar.gz \ # Download source file, extract and compile WORKDIR /tmp/oxidized -RUN apk --no-cache upgrade \ - && apk --no-cache add build-base cmake git libpq-dev mariadb-dev libssh2-dev icu-dev yq \ +RUN apk --no-cache add build-base cmake git libpq-dev mariadb-dev libssh2-dev icu-dev yq \ && git clone https://github.com/ytti/oxidized.git . \ && git checkout $VERSION \ && gem install --no-document aws-sdk slack-ruby-client xmpp4r cisco_spark rugged \ diff --git a/rng-tools/Dockerfile b/rng-tools/Dockerfile index 7f8fcbc..90ac259 100644 --- a/rng-tools/Dockerfile +++ b/rng-tools/Dockerfile @@ -1,8 +1,7 @@ FROM alpine:3.20.3 # Uprade and install packages to image -RUN apk --no-cache upgrade \ - && apk --no-cache add rng-tools +RUN apk --no-cache add rng-tools # Set entrypoint ENTRYPOINT ["rngd"] diff --git a/speedtest/Dockerfile b/speedtest/Dockerfile index 5e48002..3ad2a85 100644 --- a/speedtest/Dockerfile +++ b/speedtest/Dockerfile @@ -2,22 +2,8 @@ FROM debian:12.7-slim # Install xz-utils RUN apt-get update \ - && apt-get --yes upgrade \ && apt-get --yes install xz-utils wget -# Add s6-overlay -WORKDIR /tmp -ENV S6_OVERLAY_VERSION=3.2.0.0 -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz.sha256 /tmp -RUN echo "$(cat s6-overlay-noarch.tar.xz.sha256)" | sha256sum -c - \ - && tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz /tmp -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz.sha256 /tmp -RUN echo "$(cat s6-overlay-x86_64.tar.xz.sha256)" | sha256sum -c - \ - && tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz -COPY s6-rc.d/ /etc/s6-overlay/s6-rc.d/ - # Set work directory WORKDIR /opt/speedtest/ @@ -27,10 +13,7 @@ RUN wget https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-linux-x86_6 && apt-get --yes remove xz-utils wget \ && apt-get --yes autoremove -# Copy files -COPY speedtest.sh /opt/scripts/ - # Set entrypoint -ENTRYPOINT ["/init"] +ENTRYPOINT ["/opt/speedtest/speedtest", "--accept-license", "--progress=no"] LABEL org.opencontainers.image.authors="MattKobayashi " diff --git a/speedtest/s6-rc.d/init-speedtest/dependencies.d/base b/speedtest/s6-rc.d/init-speedtest/dependencies.d/base deleted file mode 100644 index e69de29..0000000 diff --git a/speedtest/s6-rc.d/init-speedtest/type b/speedtest/s6-rc.d/init-speedtest/type deleted file mode 100644 index bdd22a1..0000000 --- a/speedtest/s6-rc.d/init-speedtest/type +++ /dev/null @@ -1 +0,0 @@ -oneshot diff --git a/speedtest/s6-rc.d/init-speedtest/up b/speedtest/s6-rc.d/init-speedtest/up deleted file mode 100644 index ee5eac3..0000000 --- a/speedtest/s6-rc.d/init-speedtest/up +++ /dev/null @@ -1,2 +0,0 @@ -#!/command/execlineb -P -/opt/scripts/speedtest.sh diff --git a/speedtest/s6-rc.d/user/contents.d/init-speedtest b/speedtest/s6-rc.d/user/contents.d/init-speedtest deleted file mode 100644 index e69de29..0000000 diff --git a/speedtest/speedtest.sh b/speedtest/speedtest.sh deleted file mode 100755 index 0c34d19..0000000 --- a/speedtest/speedtest.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -/opt/speedtest/speedtest --accept-license --progress=no diff --git a/stun/Dockerfile b/stun/Dockerfile index b96edc0..7c42e2b 100644 --- a/stun/Dockerfile +++ b/stun/Dockerfile @@ -6,8 +6,7 @@ ENV SOURCE_HASH=4479e1ae070651dfc4836a998267c7ac2fba4f011abcfdca3b8ccd7736d4fd26 WORKDIR /stuntman -RUN apk --no-cache upgrade \ - && apk --no-cache add build-base boost-dev openssl-dev wget tar \ +RUN apk --no-cache add build-base boost-dev openssl-dev wget tar \ && wget -O $SOURCE_FILE https://www.stunprotocol.org/stunserver-$SOURCE_VERSION.tgz \ && echo "$SOURCE_HASH $SOURCE_FILE" | sha256sum -c \ && tar -xz --strip-components=1 --file="$SOURCE_FILE" \ @@ -18,7 +17,6 @@ FROM alpine:3.20.3 WORKDIR /stuntman RUN addgroup -S stuntman && adduser -S stuntman -G stuntman \ - && apk --no-cache upgrade \ && apk --no-cache add libstdc++ libgcc USER stuntman diff --git a/telegraf/Dockerfile b/telegraf/Dockerfile index ad3fc93..1490d20 100644 --- a/telegraf/Dockerfile +++ b/telegraf/Dockerfile @@ -5,12 +5,7 @@ WORKDIR /opt/docker-telegraf # Install Python and requirements COPY requirements.txt . -RUN apk --no-cache upgrade \ - && apk --no-cache add python3 py3-requests - -# Install other dependencies -RUN apk --no-cache upgrade \ - && apk --no-cache add telegraf smartmontools jq curl lm-sensors wget +RUN apk --no-cache add python3 py3-requests telegraf smartmontools jq curl lm-sensors wget # Install Ookla Speedtest CLI utility WORKDIR /opt/ookla diff --git a/telegraf/s6-rc.d/svc-telegraf/dependencies.d/base b/telegraf/s6-rc.d/svc-telegraf/dependencies.d/base deleted file mode 100644 index e69de29..0000000 diff --git a/telegraf/s6-rc.d/svc-telegraf/finish b/telegraf/s6-rc.d/svc-telegraf/finish deleted file mode 100755 index 6a0f8b2..0000000 --- a/telegraf/s6-rc.d/svc-telegraf/finish +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env sh - -if test "$1" -eq 256 ; then - e=$((128 + $2)) -else - e="$1" -fi - -echo "$e" > /run/s6-linux-init-container-results/exitcode diff --git a/telegraf/s6-rc.d/svc-telegraf/run b/telegraf/s6-rc.d/svc-telegraf/run deleted file mode 100755 index 2f685f6..0000000 --- a/telegraf/s6-rc.d/svc-telegraf/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env sh - -exec telegraf diff --git a/telegraf/s6-rc.d/svc-telegraf/type b/telegraf/s6-rc.d/svc-telegraf/type deleted file mode 100644 index 5883cff..0000000 --- a/telegraf/s6-rc.d/svc-telegraf/type +++ /dev/null @@ -1 +0,0 @@ -longrun diff --git a/telegraf/s6-rc.d/svc-telegraf/up b/telegraf/s6-rc.d/svc-telegraf/up deleted file mode 100644 index e69de29..0000000 diff --git a/telegraf/s6-rc.d/user/contents.d/svc-mdns-reflector b/telegraf/s6-rc.d/user/contents.d/svc-mdns-reflector deleted file mode 100644 index e69de29..0000000 diff --git a/vyos-release-alert/Dockerfile b/vyos-release-alert/Dockerfile index 81ff0ea..a22bc6e 100644 --- a/vyos-release-alert/Dockerfile +++ b/vyos-release-alert/Dockerfile @@ -2,13 +2,12 @@ FROM python:3.12.6-alpine3.20 WORKDIR /opt/vyos-blog-alert -RUN apk --no-cache upgrade \ - && apk --no-cache add supercronic \ +RUN apk --no-cache add supercronic \ && python3 -m pip install --break-system-packages feedparser COPY main.py main.py COPY crontab crontab -ENTRYPOINT ["supercronic", "/opt/vyos-blog-alert/crontab"] +ENTRYPOINT ["/usr/bin/supercronic", "/opt/vyos-blog-alert/crontab"] LABEL org.opencontainers.image.authors="MattKobayashi " diff --git a/xteve/Dockerfile b/xteve/Dockerfile index 92e5e99..db6de51 100644 --- a/xteve/Dockerfile +++ b/xteve/Dockerfile @@ -1,21 +1,7 @@ FROM alpine:3.20.3 -# Add s6-overlay -WORKDIR /tmp -ENV S6_OVERLAY_VERSION=3.2.0.0 -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz.sha256 /tmp -RUN echo "$(cat s6-overlay-noarch.tar.xz.sha256)" | sha256sum -c - \ - && tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz /tmp -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz.sha256 /tmp -RUN echo "$(cat s6-overlay-x86_64.tar.xz.sha256)" | sha256sum -c - \ - && tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz -COPY s6-rc.d/ /etc/s6-overlay/s6-rc.d/ - # Install dependencies and set timezone -RUN apk --no-cache upgrade \ - && apk add --no-cache ca-certificates curl tzdata bash busybox-suid su-exec ffmpeg vlc \ +RUN apk add --no-cache ca-certificates curl tzdata bash busybox-suid su-exec ffmpeg vlc \ && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \ && sed -i 's/geteuid/getppid/' /usr/bin/vlc @@ -34,6 +20,6 @@ RUN chmod +x /entrypoint.sh \ EXPOSE 34400 # Set entrypoint -ENTRYPOINT ["/init"] +ENTRYPOINT ["/entrypoint.sh"] LABEL org.opencontainers.image.authors="MattKobayashi , alturismo " diff --git a/xteve/s6-rc.d/svc-xteve/dependencies.d/base b/xteve/s6-rc.d/svc-xteve/dependencies.d/base deleted file mode 100644 index e69de29..0000000 diff --git a/xteve/s6-rc.d/svc-xteve/finish b/xteve/s6-rc.d/svc-xteve/finish deleted file mode 100755 index 6a0f8b2..0000000 --- a/xteve/s6-rc.d/svc-xteve/finish +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env sh - -if test "$1" -eq 256 ; then - e=$((128 + $2)) -else - e="$1" -fi - -echo "$e" > /run/s6-linux-init-container-results/exitcode diff --git a/xteve/s6-rc.d/svc-xteve/run b/xteve/s6-rc.d/svc-xteve/run deleted file mode 100755 index aa5828d..0000000 --- a/xteve/s6-rc.d/svc-xteve/run +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash - -crond -l 2 - -CRONJOB_FILE=/config/cronjob.sh - -if [ -f "$CRONJOB_FILE" ]; then - echo "$CRONJOB_FILE exist" - chmod +x $CRONJOB_FILE - chmod 777 $CRONJOB_FILE -else - echo "$CRONJOB_FILE does not exist" - cp /cronjob.sh $CRONJOB_FILE - chmod +x $CRONJOB_FILE - chmod 777 $CRONJOB_FILE -fi - -CRON_FILE=/config/cron.txt - -if [ -f "$CRON_FILE" ]; then - . $CRON_FILE -else - printf '0 0 * * * /config/cronjob.sh' > /etc/crontabs/root - cp /sample_cron.txt /config/sample_cron.txt -fi - -XTEVE_FILE=/config/xteve.txt - -if [ -f "$XTEVE_FILE" ]; then - . $XTEVE_FILE -else - cp /sample_xteve.txt /config/sample_xteve.txt - xteve -port=34400 -config=/root/.xteve/ -fi - -exit diff --git a/xteve/s6-rc.d/svc-xteve/type b/xteve/s6-rc.d/svc-xteve/type deleted file mode 100644 index 5883cff..0000000 --- a/xteve/s6-rc.d/svc-xteve/type +++ /dev/null @@ -1 +0,0 @@ -longrun diff --git a/xteve/s6-rc.d/svc-xteve/up b/xteve/s6-rc.d/svc-xteve/up deleted file mode 100644 index e69de29..0000000 diff --git a/xteve/s6-rc.d/user/contents.d/svc-xteve b/xteve/s6-rc.d/user/contents.d/svc-xteve deleted file mode 100644 index e69de29..0000000 diff --git a/yancobat/Dockerfile b/yancobat/Dockerfile index ecd65df..bdfb5a4 100644 --- a/yancobat/Dockerfile +++ b/yancobat/Dockerfile @@ -1,21 +1,6 @@ FROM alpine:3.20.3 -ARG TARGETPLATFORM -ENV SUPERCRONIC_SHA1SUM_amd64=cd48d45c4b10f3f0bfdd3a57d054cd05ac96812b \ - SUPERCRONIC_SHA1SUM_arm=75e065bf0909f920b06d5bd797c0e6b31e68b112 \ - SUPERCRONIC_SHA1SUM_arm64=512f6736450c56555e01b363144c3c9d23abed4c \ - SUPERCRONIC_SHA1SUM_i386=3436985298ce241d7d9477eb9eab164b582717a8 \ - SUPERCRONIC_VERSION=v0.2.29 - -RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCH=amd64; elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then ARCH=arm; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCH=arm64; elif [ "$TARGETPLATFORM" = "linux/i386" ]; then ARCH=i386; else exit 1; fi \ - && export SUPERCRONIC="supercronic-linux-${ARCH}" \ - && export SUPERCRONIC_URL="https://github.com/aptible/supercronic/releases/download/${SUPERCRONIC_VERSION}/${SUPERCRONIC}" \ - && wget "$SUPERCRONIC_URL" \ - && eval SUPERCRONIC_SHA1SUM='$SUPERCRONIC_SHA1SUM_'$ARCH \ - && echo "${SUPERCRONIC_SHA1SUM} ${SUPERCRONIC}" | sha1sum -c - \ - && chmod +x "${SUPERCRONIC}" \ - && mv "$SUPERCRONIC" "/usr/local/bin/${SUPERCRONIC}" \ - && ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic \ +RUN apk --no-cache add supercronic \ && addgroup -S ansible && adduser -S ansible -G ansible \ && mkdir /repo && chown -R ansible /repo \ && apk --no-cache upgrade \ diff --git a/yancobat/entrypoint.sh b/yancobat/entrypoint.sh index fdf4f01..12d5954 100644 --- a/yancobat/entrypoint.sh +++ b/yancobat/entrypoint.sh @@ -21,4 +21,4 @@ if [ -f /run/secrets/NOTIFY_TELEGRAM_TOKEN ]; then fi ansible-playbook -i /ansible/vars.yaml /ansible/yancobat-setup.yaml -exec supercronic /ansible/crontab/ansible-cron +exec /usr/bin/supercronic /ansible/crontab/ansible-cron