diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index c1a98b3..24b9800 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -65,20 +65,16 @@ jobs: fail-fast: false matrix: IMAGES: - - "library/redis/latest library/redis/alpine library/redis/7 library/redis/7-alpine library/redis/7-bookworm library/redis/7-bullseye" + - "library/redis/5 library/redis/5-alpine" + - "library/redis/6 library/redis/6-alpine" + - "library/redis/7 library/redis/7-alpine" + - "library/redis/alpine library/redis/latest" #- "corpusops/test/a corpusops/test/b corpusops/test/c" # all images that werent explicitly told to be built would be built in the next batches # we span them onto N jobs - - "zleftover:1/10" - - "zleftover:2/10" - - "zleftover:3/10" - - "zleftover:4/10" - - "zleftover:5/10" - - "zleftover:6/10" - - "zleftover:7/10" - - "zleftover:8/10" - - "zleftover:9/10" - - "zleftover:10/10" + - "zleftover:1/2" + - "zleftover:2/2" + on: push: diff --git a/.github/workflows/cicd.yml.in b/.github/workflows/cicd.yml.in index c7810f1..f334b47 100644 --- a/.github/workflows/cicd.yml.in +++ b/.github/workflows/cicd.yml.in @@ -68,16 +68,9 @@ jobs: #- "corpusops/test/a corpusops/test/b corpusops/test/c" # all images that werent explicitly told to be built would be built in the next batches # we span them onto N jobs - - "zleftover:1/10" - - "zleftover:2/10" - - "zleftover:3/10" - - "zleftover:4/10" - - "zleftover:5/10" - - "zleftover:6/10" - - "zleftover:7/10" - - "zleftover:8/10" - - "zleftover:9/10" - - "zleftover:10/10" + - "zleftover:1/2" + - "zleftover:2/2" + on: push: diff --git a/Dockerfile.args b/Dockerfile.args index 21233ee..bd8e2a9 100644 --- a/Dockerfile.args +++ b/Dockerfile.args @@ -3,7 +3,7 @@ ARG NONINTERACTIVE=y ARG DEBIAN_FRONTEND=noninteractive ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} +ARG COPS_SYSTEM=${_cops_SYSTEM-} ARG FOREGO_RELEASE=latest ARG REMCO_RELEASE=latest ARG GOSU_RELEASE=latest diff --git a/helpers/up.sh b/helpers/up.sh index 577201d..09233c8 100755 --- a/helpers/up.sh +++ b/helpers/up.sh @@ -1,5 +1,5 @@ #!/usr/bin/env sh -set -e +set -ex log() { echo "${@}" >&2; } vv() { log "${@}";"${@}"; } DO_UPDATE=1 @@ -22,6 +22,7 @@ oldubuntu="^(10\.|12\.|13\.|14\.|15\.|16\.|17\.|18\.10|19\.|20\.10|21\.|22\.10)" # oldubuntu="^(10\.|12\.|13\.|14.10|15\.|16.10|17\.04)" NOSOCAT="" CENTOS_OLDSTABLE=8 +CENTOS_OLDSTABLES="6|7|8" OAPTMIRROR="${OAPTMIRROR:-}" OYUMMIRROR="${OYUMMIRROR:-}" NYUMMIRROR="${NYUMMIRROR:-}" @@ -29,6 +30,7 @@ OUBUNTUMIRROR="${OUBUNTUMIRROR:-old-releases.ubuntu.com}" ODEBIANMIRROR="${ODEBIANMIRROR:-archive.debian.org}" NDEBIANMIRROR="${NDEBIANMIRROR:-http.debian.net|httpredir.debian.org|deb.debian.org}" NUBUNTUMIRROR="${NUBUNTUMIRROR:-archive.ubuntu.com|security.ubuntu.com}" +IS_OLD_CENTOS_STABLE="" SNCENTOSMIRROR="$(echo "${NCENTOSMIRROR}"|sed -re "s/\|.*//g")" SNDEBIANMIRROR="$(echo "${NDEBIANMIRROR}"|sed -re "s/\|.*//g")" SNUBUNTUMIRROR="$(echo "${NUBUNTUMIRROR}"|sed -re "s/\|.*//g")" @@ -58,27 +60,27 @@ elif [ -e /etc/redhat-release ];then DISTRIB_RELEASE=$(echo $(head /etc/issue)|awk '{print tolower($3)}') fi DISTRIB_MAJOR="$(echo ${DISTRIB_RELEASE}|sed -re "s/\..*//g")" -if [ "x${DISTRIB_ID}" = "xcentos" ] && ( echo "${DISTRIB_MAJOR}" | grep -Eq "^(6|7|8)");then - sed -i 's/^mirrorlist/#mirrorlist/g;s|^#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* -fi -if ( echo $DISTRIB_ID | grep -E -iq "centos|red|fedora" );then - if (echo $DISTRIB_ID|grep -E -iq centos);then - if (echo "$DISTRIB_RELEASE"|egrep -q "8|7");then - OCENTOSMIRROR="${OCENTOSMIRROR:-mirror.centos.org}" - NCENTOSMIRROR="${NCENTOSMIRROR:-vault.centos.org}" - elif [ $DISTRIB_RELEASE -le $CENTOS_OLDSTABLE ];then - OCENTOSMIRROR="${OCENTOSMIRROR:-vault.centos.org}" - NCENTOSMIRROR="${NCENTOSMIRROR:-mirror.centos.org}" - else - OCENTOSMIRROR="${OCENTOSMIRROR:-mirror.centos.org}" - NCENTOSMIRROR="${NCENTOSMIRROR:-vault.centos.org}" - fi - OYUMMIRROR="${OCENTOSMIRROR}" - NYUMMIRROR="${NCENTOSMIRROR}" +EPEL_RPM_URL="https://dl.fedoraproject.org/pub/epel/epel-release-latest-${DISTRIB_MAJOR}.noarch.rpm" +if [ "x${DISTRIB_ID}" = "xcentos" ] && ( echo "${DISTRIB_MAJOR}" | grep -Eq "$CENTOS_OLDSTABLES");then + IS_OLD_CENTOS_STABLE="1" + EPEL_RPM_URL="https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" + if (echo "$DISTRIB_RELEASE"|egrep -q "8|7");then + OCENTOSMIRROR="${OCENTOSMIRROR:-mirror.centos.org}" + NCENTOSMIRROR="${NCENTOSMIRROR:-vault.centos.org}" + elif [ $DISTRIB_RELEASE -le $CENTOS_OLDSTABLE ];then + OCENTOSMIRROR="${OCENTOSMIRROR:-vault.centos.org}" + NCENTOSMIRROR="${NCENTOSMIRROR:-mirror.centos.org}" + else + OCENTOSMIRROR="${OCENTOSMIRROR:-mirror.centos.org}" + NCENTOSMIRROR="${NCENTOSMIRROR:-vault.centos.org}" fi + OYUMMIRROR="${OCENTOSMIRROR}" + NYUMMIRROR="${NCENTOSMIRROR}" if [ "$OYUMMIRROR" != "x" ];then - sed -i -r -e 's!'$NCENTOSMIRROR'!'$OCENTOSMIRROR'!g' $( find /etc/yum.repos.d -type f; ) + sed -i -r -e 's!'$OCENTOSMIRROR'!'$NCENTOSMIRROR'!g' $( find /etc/yum.repos.d -type f; ) fi + sed -i "s/^#.*baseurl=http/baseurl=http/g" $( find /etc/yum.repos.d -type f; ) + sed -i "s/^mirrorlist=http/#mirrorlist=http/g" $( find /etc/yum.repos.d -type f; ) fi if ( grep -q amzn /etc/os-release );then yuminstall findutils @@ -96,9 +98,8 @@ if [ -e /etc/redhat-release ];then vv yum upgrade -y --nogpg fedora-gpg-keys fedora-repos fi if [ ! -e /etc/yum.repos.d/epel.repo ];then - rpm="epel-release-latest-${DISTRIB_MAJOR}.noarch.rpm" - curl -sSLO "https://dl.fedoraproject.org/pub/epel/$rpm" - rpm -ivh $(pwd)/$rpm + curl -sSLO "$EPEL_RPM_URL" + rpm -ivh $(pwd)/$(basename $EPEL_RPM_URL) fi if ! ( find --version >/dev/null 2>&1);then yuminstall findutils diff --git a/library/redis/5-alpine/Dockerfile b/library/redis/5-alpine/Dockerfile index 2af2028..9513c3d 100644 --- a/library/redis/5-alpine/Dockerfile +++ b/library/redis/5-alpine/Dockerfile @@ -6,7 +6,7 @@ ARG NONINTERACTIVE=y ARG DEBIAN_FRONTEND=noninteractive ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} +ARG COPS_SYSTEM=${_cops_SYSTEM-} ARG FOREGO_RELEASE=latest ARG REMCO_RELEASE=latest ARG GOSU_RELEASE=latest diff --git a/library/redis/5-bullseye/Dockerfile b/library/redis/5-bullseye/Dockerfile deleted file mode 100644 index 353cc82..0000000 --- a/library/redis/5-bullseye/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:5-bullseye -ARG RSYNC=corpusops/rsync -FROM library/redis:5-bullseye AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/5-buster/Dockerfile b/library/redis/5-buster/Dockerfile deleted file mode 100644 index 47cf00a..0000000 --- a/library/redis/5-buster/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:5-buster -ARG RSYNC=corpusops/rsync -FROM library/redis:5-buster AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/5.0-alpine/Dockerfile b/library/redis/5.0-alpine/Dockerfile deleted file mode 100644 index e1822f2..0000000 --- a/library/redis/5.0-alpine/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:5.0-alpine -ARG RSYNC=corpusops/rsync -FROM library/redis:5.0-alpine AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/5.0-bullseye/Dockerfile b/library/redis/5.0-bullseye/Dockerfile deleted file mode 100644 index 4be066f..0000000 --- a/library/redis/5.0-bullseye/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:5.0-bullseye -ARG RSYNC=corpusops/rsync -FROM library/redis:5.0-bullseye AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/5.0-buster/Dockerfile b/library/redis/5.0-buster/Dockerfile deleted file mode 100644 index f6c29d9..0000000 --- a/library/redis/5.0-buster/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:5.0-buster -ARG RSYNC=corpusops/rsync -FROM library/redis:5.0-buster AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/5.0/Dockerfile b/library/redis/5.0/Dockerfile deleted file mode 100644 index 46254ee..0000000 --- a/library/redis/5.0/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:5.0 -ARG RSYNC=corpusops/rsync -FROM library/redis:5.0 AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/5/Dockerfile b/library/redis/5/Dockerfile index 7756be3..ba35be3 100644 --- a/library/redis/5/Dockerfile +++ b/library/redis/5/Dockerfile @@ -6,7 +6,7 @@ ARG NONINTERACTIVE=y ARG DEBIAN_FRONTEND=noninteractive ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} +ARG COPS_SYSTEM=${_cops_SYSTEM-} ARG FOREGO_RELEASE=latest ARG REMCO_RELEASE=latest ARG GOSU_RELEASE=latest diff --git a/library/redis/6-alpine/Dockerfile b/library/redis/6-alpine/Dockerfile index 5d0d619..601a866 100644 --- a/library/redis/6-alpine/Dockerfile +++ b/library/redis/6-alpine/Dockerfile @@ -6,7 +6,7 @@ ARG NONINTERACTIVE=y ARG DEBIAN_FRONTEND=noninteractive ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} +ARG COPS_SYSTEM=${_cops_SYSTEM-} ARG FOREGO_RELEASE=latest ARG REMCO_RELEASE=latest ARG GOSU_RELEASE=latest diff --git a/library/redis/6-bookworm/Dockerfile b/library/redis/6-bookworm/Dockerfile deleted file mode 100644 index a047a3b..0000000 --- a/library/redis/6-bookworm/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:6-bookworm -ARG RSYNC=corpusops/rsync -FROM library/redis:6-bookworm AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/6-bullseye/Dockerfile b/library/redis/6-bullseye/Dockerfile deleted file mode 100644 index b721956..0000000 --- a/library/redis/6-bullseye/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:6-bullseye -ARG RSYNC=corpusops/rsync -FROM library/redis:6-bullseye AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/6-buster/Dockerfile b/library/redis/6-buster/Dockerfile deleted file mode 100644 index 9e11e6b..0000000 --- a/library/redis/6-buster/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:6-buster -ARG RSYNC=corpusops/rsync -FROM library/redis:6-buster AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/6.0-alpine/Dockerfile b/library/redis/6.0-alpine/Dockerfile deleted file mode 100644 index 75f8d83..0000000 --- a/library/redis/6.0-alpine/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:6.0-alpine -ARG RSYNC=corpusops/rsync -FROM library/redis:6.0-alpine AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/6.0-bookworm/Dockerfile b/library/redis/6.0-bookworm/Dockerfile deleted file mode 100644 index f12565c..0000000 --- a/library/redis/6.0-bookworm/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:6.0-bookworm -ARG RSYNC=corpusops/rsync -FROM library/redis:6.0-bookworm AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/6.0-bullseye/Dockerfile b/library/redis/6.0-bullseye/Dockerfile deleted file mode 100644 index af0a9b6..0000000 --- a/library/redis/6.0-bullseye/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:6.0-bullseye -ARG RSYNC=corpusops/rsync -FROM library/redis:6.0-bullseye AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/6.0-buster/Dockerfile b/library/redis/6.0-buster/Dockerfile deleted file mode 100644 index 243425f..0000000 --- a/library/redis/6.0-buster/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:6.0-buster -ARG RSYNC=corpusops/rsync -FROM library/redis:6.0-buster AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/6.0/Dockerfile b/library/redis/6.0/Dockerfile deleted file mode 100644 index f5e9065..0000000 --- a/library/redis/6.0/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:6.0 -ARG RSYNC=corpusops/rsync -FROM library/redis:6.0 AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/6.2-alpine/Dockerfile b/library/redis/6.2-alpine/Dockerfile deleted file mode 100644 index a0ac388..0000000 --- a/library/redis/6.2-alpine/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:6.2-alpine -ARG RSYNC=corpusops/rsync -FROM library/redis:6.2-alpine AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/6.2-bookworm/Dockerfile b/library/redis/6.2-bookworm/Dockerfile deleted file mode 100644 index 59a6799..0000000 --- a/library/redis/6.2-bookworm/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:6.2-bookworm -ARG RSYNC=corpusops/rsync -FROM library/redis:6.2-bookworm AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/6.2-bullseye/Dockerfile b/library/redis/6.2-bullseye/Dockerfile deleted file mode 100644 index 7978830..0000000 --- a/library/redis/6.2-bullseye/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:6.2-bullseye -ARG RSYNC=corpusops/rsync -FROM library/redis:6.2-bullseye AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/6.2-buster/Dockerfile b/library/redis/6.2-buster/Dockerfile deleted file mode 100644 index b1662d4..0000000 --- a/library/redis/6.2-buster/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:6.2-buster -ARG RSYNC=corpusops/rsync -FROM library/redis:6.2-buster AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/6.2/Dockerfile b/library/redis/6.2/Dockerfile deleted file mode 100644 index 84a718c..0000000 --- a/library/redis/6.2/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:6.2 -ARG RSYNC=corpusops/rsync -FROM library/redis:6.2 AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/6/Dockerfile b/library/redis/6/Dockerfile index 800e143..97ca8df 100644 --- a/library/redis/6/Dockerfile +++ b/library/redis/6/Dockerfile @@ -6,7 +6,7 @@ ARG NONINTERACTIVE=y ARG DEBIAN_FRONTEND=noninteractive ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} +ARG COPS_SYSTEM=${_cops_SYSTEM-} ARG FOREGO_RELEASE=latest ARG REMCO_RELEASE=latest ARG GOSU_RELEASE=latest diff --git a/library/redis/7-alpine/Dockerfile b/library/redis/7-alpine/Dockerfile index 35b6d9f..ac61b45 100644 --- a/library/redis/7-alpine/Dockerfile +++ b/library/redis/7-alpine/Dockerfile @@ -6,7 +6,7 @@ ARG NONINTERACTIVE=y ARG DEBIAN_FRONTEND=noninteractive ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} +ARG COPS_SYSTEM=${_cops_SYSTEM-} ARG FOREGO_RELEASE=latest ARG REMCO_RELEASE=latest ARG GOSU_RELEASE=latest diff --git a/library/redis/7-bookworm/Dockerfile b/library/redis/7-bookworm/Dockerfile deleted file mode 100644 index c1609ba..0000000 --- a/library/redis/7-bookworm/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:7-bookworm -ARG RSYNC=corpusops/rsync -FROM library/redis:7-bookworm AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/7-bullseye/Dockerfile b/library/redis/7-bullseye/Dockerfile deleted file mode 100644 index 9fe57e4..0000000 --- a/library/redis/7-bullseye/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:7-bullseye -ARG RSYNC=corpusops/rsync -FROM library/redis:7-bullseye AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/7.0-alpine/Dockerfile b/library/redis/7.0-alpine/Dockerfile deleted file mode 100644 index ede4136..0000000 --- a/library/redis/7.0-alpine/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:7.0-alpine -ARG RSYNC=corpusops/rsync -FROM library/redis:7.0-alpine AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/7.0-bookworm/Dockerfile b/library/redis/7.0-bookworm/Dockerfile deleted file mode 100644 index a1d48b6..0000000 --- a/library/redis/7.0-bookworm/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:7.0-bookworm -ARG RSYNC=corpusops/rsync -FROM library/redis:7.0-bookworm AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/7.0-bullseye/Dockerfile b/library/redis/7.0-bullseye/Dockerfile deleted file mode 100644 index bcb0b6f..0000000 --- a/library/redis/7.0-bullseye/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:7.0-bullseye -ARG RSYNC=corpusops/rsync -FROM library/redis:7.0-bullseye AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/7.0/Dockerfile b/library/redis/7.0/Dockerfile deleted file mode 100644 index d3b48bf..0000000 --- a/library/redis/7.0/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:7.0 -ARG RSYNC=corpusops/rsync -FROM library/redis:7.0 AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/7.2-alpine/Dockerfile b/library/redis/7.2-alpine/Dockerfile deleted file mode 100644 index 519bb81..0000000 --- a/library/redis/7.2-alpine/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:7.2-alpine -ARG RSYNC=corpusops/rsync -FROM library/redis:7.2-alpine AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/7.2-bookworm/Dockerfile b/library/redis/7.2-bookworm/Dockerfile deleted file mode 100644 index 9b68127..0000000 --- a/library/redis/7.2-bookworm/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:7.2-bookworm -ARG RSYNC=corpusops/rsync -FROM library/redis:7.2-bookworm AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/7.2/Dockerfile b/library/redis/7.2/Dockerfile deleted file mode 100644 index 8abf115..0000000 --- a/library/redis/7.2/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:7.2 -ARG RSYNC=corpusops/rsync -FROM library/redis:7.2 AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/7.4-alpine/Dockerfile b/library/redis/7.4-alpine/Dockerfile deleted file mode 100644 index e42e988..0000000 --- a/library/redis/7.4-alpine/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:7.4-alpine -ARG RSYNC=corpusops/rsync -FROM library/redis:7.4-alpine AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/7.4-bookworm/Dockerfile b/library/redis/7.4-bookworm/Dockerfile deleted file mode 100644 index 405253f..0000000 --- a/library/redis/7.4-bookworm/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:7.4-bookworm -ARG RSYNC=corpusops/rsync -FROM library/redis:7.4-bookworm AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/7.4/Dockerfile b/library/redis/7.4/Dockerfile deleted file mode 100644 index 07aa2bf..0000000 --- a/library/redis/7.4/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:7.4 -ARG RSYNC=corpusops/rsync -FROM library/redis:7.4 AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/7/Dockerfile b/library/redis/7/Dockerfile index ab4881f..695415b 100644 --- a/library/redis/7/Dockerfile +++ b/library/redis/7/Dockerfile @@ -6,7 +6,7 @@ ARG NONINTERACTIVE=y ARG DEBIAN_FRONTEND=noninteractive ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} +ARG COPS_SYSTEM=${_cops_SYSTEM-} ARG FOREGO_RELEASE=latest ARG REMCO_RELEASE=latest ARG GOSU_RELEASE=latest diff --git a/library/redis/alpine/Dockerfile b/library/redis/alpine/Dockerfile index 48d6d9d..5d89fce 100644 --- a/library/redis/alpine/Dockerfile +++ b/library/redis/alpine/Dockerfile @@ -6,7 +6,7 @@ ARG NONINTERACTIVE=y ARG DEBIAN_FRONTEND=noninteractive ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} +ARG COPS_SYSTEM=${_cops_SYSTEM-} ARG FOREGO_RELEASE=latest ARG REMCO_RELEASE=latest ARG GOSU_RELEASE=latest diff --git a/library/redis/bookworm/Dockerfile b/library/redis/bookworm/Dockerfile deleted file mode 100644 index 25d74d9..0000000 --- a/library/redis/bookworm/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:bookworm -ARG RSYNC=corpusops/rsync -FROM library/redis:bookworm AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/bullseye/Dockerfile b/library/redis/bullseye/Dockerfile deleted file mode 100644 index 080115e..0000000 --- a/library/redis/bullseye/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:bullseye -ARG RSYNC=corpusops/rsync -FROM library/redis:bullseye AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/buster/Dockerfile b/library/redis/buster/Dockerfile deleted file mode 100644 index a76f638..0000000 --- a/library/redis/buster/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -ARG ANCESTOR=library/redis:buster -ARG RSYNC=corpusops/rsync -FROM library/redis:buster AS final -ARG DO_UPDATE=y -ARG NONINTERACTIVE=y -ARG DEBIAN_FRONTEND=noninteractive -ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" -ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} -ARG FOREGO_RELEASE=latest -ARG REMCO_RELEASE=latest -ARG GOSU_RELEASE=latest -ARG DOCKERIZE_RELEASE=latest -ARG CURL_SSL_OPTS=--tlsv1 -ARG DOCKER_IMAGES_COMMIT=master -ARG COPS_HELPERS=/cops_helpers -ADD \ - helpers/up.sh \ - helpers/add_gosu.sh \ - helpers/system_detect.sh \ - helpers/add_frep.sh \ - helpers/add_confd.sh \ - helpers/add_dockerize.sh \ - helpers/add_forego.sh \ - helpers/add_opt_pkgs.sh \ - helpers/add_remco.sh \ - helpers/setup_locales.sh \ - helpers/cops_pkgmgr_install.sh \ - helpers/*_up.sh \ - helpers/*_clean.sh \ - rootfs/ \ - packages/*packages*.txt \ - ${EXTRA_FILES_LIST} \ - /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && cd /tmp/corpusopssteroids \ - && : \ - && chmod +x *sh \ - && if [ ! -e $COPS_HELPERS ];then mkdir -p "$COPS_HELPERS";fi \ - && export PATH=$(pwd):$PATH \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && cat ${_cops_SYSTEM}_optional_packages*.txt optional_packages*.txt > optional_packages.txt \ - && cat ${_cops_SYSTEM}_packages*.txt > packages.txt \ - && : fix logrorate global conf \ - && if [ -e /var/log ];then touch /var/log/syslog /var/log/messages;fi \ - && ./${_cops_SYSTEM}_up.sh \ - && ./add_opt_pkgs.sh \ - && ./add_frep.sh \ - && ./add_remco.sh \ - && ./add_confd.sh \ - && ./add_dockerize.sh \ - && ./add_gosu.sh \ - && ./add_forego.sh \ - && ln -sfv ${COPS_HELPERS}/supervisord-go /bin/supervisord-go \ - && DEBUG=1 ./setup_locales.sh \ - && sed -i -re "/var\\/log\\/messages \\{\\}/d" /etc/logrotate.conf\ - && sed -i -re "s/ dateext/nodateext/g" /etc/logrotate.conf\ - && if ! (grep -q /var/log/messages /etc/logrotate.conf);then\ - printf "\\n/var/log/messages {\\nmissingok\\n}\\n\\n" >>/etc/logrotate.conf;fi\ - && for i in bin/* system_detect.sh setup_locales.sh cops_pkgmgr_install.sh;do j=$(basename $i);cp -v $i /cops_helpers && ln -sfv /cops_helpers/$j /bin/$j;done\ - && ./${_cops_SYSTEM}_clean.sh \ - ' -COPY --from=ochinchina/supervisord:latest \ - /usr/local/bin/supervisord ${COPS_HELPERS}/supervisord-go -ADD \ - rootfs/etc/rsyslog.d/ \ - /etc/rsyslog.d/ -ADD \ - rootfs/etc/rsyslog.conf.frep \ - /etc/rsyslog.conf.frep -ADD \ - rootfs/etc/supervisor.d/rsyslog \ - rootfs/etc/supervisor.d/cron \ - /etc/supervisor.d/ -ADD rootfs/etc/logrotate.conf /etc/ -ADD rootfs/etc/logrotate.d/* /etc/logrotate.d/ -ADD helpers/system_detect.sh helpers/*_clean.sh /tmp/corpusopssteroids/ -RUN sh -c 'set -ex \ - && echo fixperms >&2 \ - && ( chmod -vf g-wx,o-wx /etc/logrotate.d/* /etc/logrotate.conf || true ) \ - && echo cleanup >&2 \ - && cd /tmp/corpusopssteroids \ - && chmod +x *sh \ - && _cops_SYSTEM=$(./system_detect.sh) \ - && ./${_cops_SYSTEM}_clean.sh \ - && ./common_clean.sh \ - && cd / && rm -rf /tmp/corpusopssteroids /var/cache/apk/* /var/lib/apt/lists/*' -FROM $RSYNC AS squashed-rsync -FROM $ANCESTOR AS squashed-ancestor -ARG ROOTFS="/BASE_ROOTFS_TO_COPY_THAT_WONT_COLLIDE_1234567890" -ARG PATH="${ROOTFS}_rsync/bin:$PATH" -SHELL ["busybox", "sh", "-c"] -RUN --mount=type=bind,from=final,target=$ROOTFS --mount=type=bind,from=squashed-rsync,target=${ROOTFS}_rsync \ -rsync -Aaz --delete ${ROOTFS}/ / --exclude=/proc --exclude=/sys --exclude=/etc/resolv.conf --exclude=/etc/hosts --exclude=$ROOTFS* --exclude=dev/shm --exclude=dev/pts --exclude=dev/mqueue -SHELL ["/bin/sh", "-c"] -ARG DOCKER_IMAGES_COMMIT="$DOCKER_IMAGES_COMMIT" -LABEL com.github.corpusops.docker-images-commit="$DOCKER_IMAGES_COMMIT" diff --git a/library/redis/imagetags b/library/redis/imagetags index 2aa1c67..c3eafdb 100644 --- a/library/redis/imagetags +++ b/library/redis/imagetags @@ -1,42 +1,8 @@ 5 5-alpine -5-bullseye -5-buster -5.0 -5.0-alpine -5.0-bullseye -5.0-buster 6 6-alpine -6-bookworm -6-bullseye -6-buster -6.0 -6.0-alpine -6.0-bookworm -6.0-bullseye -6.0-buster -6.2 -6.2-alpine -6.2-bookworm -6.2-bullseye -6.2-buster 7 7-alpine -7-bookworm -7-bullseye -7.0 -7.0-alpine -7.0-bookworm -7.0-bullseye -7.2 -7.2-alpine -7.2-bookworm -7.4 -7.4-alpine -7.4-bookworm alpine -bookworm -bullseye -buster latest diff --git a/library/redis/latest/Dockerfile b/library/redis/latest/Dockerfile index 5d6b521..afbfd98 100644 --- a/library/redis/latest/Dockerfile +++ b/library/redis/latest/Dockerfile @@ -6,7 +6,7 @@ ARG NONINTERACTIVE=y ARG DEBIAN_FRONTEND=noninteractive ARG INSTALL_DEFAULT_LOCALE="fr_FR.UTF-8" ARG EXTRA_FILES_LIST="" -ARG COPS_SYSTEM=${_cops_SYSTEM} +ARG COPS_SYSTEM=${_cops_SYSTEM-} ARG FOREGO_RELEASE=latest ARG REMCO_RELEASE=latest ARG GOSU_RELEASE=latest diff --git a/main.sh b/main.sh index 4bec541..c1e83d5 100755 --- a/main.sh +++ b/main.sh @@ -260,12 +260,15 @@ SKIPPED_TAGS="$SKIP_TF|$SKIP_MINOR_OS|$SKIP_NODE|$SKIP_DOCKER|$SKIP_MINIO|$SKIP_ CURRENT_TS=$(date +%s) IMAGES_SKIP_NS="((mailhog|postgis|pgrouting(-bare)?|^library|dejavu|(minio/(minio|mc))))" -SKIPPED_TAGS="$SKIP_MINOR|$SKIP_PRE|$SKIP_MISC|32bit|alpine3|nano|M01|stretch|jessie|wheezy|redis:([234])" +REDIS_SKIPPED_TAGS="redis:(.*(32bit|alpha|beta|rc|windows|32bit|alpine3|nano|M01|stretch|jessie|wheezy|buster|bookworm|bullseye).*|[0-9]+\.[0-9]+\.?|[234])" +SKIPPED_TAGS="$REDIS_SKIPPED_TAGS" +# (see docker-elasticsearch for example on how to use) +PROTECTED_VERSIONS="" default_images=" library/redis " -ONLY_ONE_MINOR="postgres|elasticsearch|nginx" +ONLY_ONE_MINOR="postgres|nginx|opensearch|elasticsearch" PROTECTED_TAGS="corpusops/rsyslog" find_top_node_() { img=library/node @@ -295,12 +298,14 @@ library/redis/stretch\ library/redis/4-alpine " BATCHED_IMAGES="\ -library/redis/latest\ - library/redis/alpine\ - library/redis/7\ - library/redis/7-alpine\ - library/redis/7-bookworm\ - library/redis/7-bullseye::10 +library/redis/5\ + library/redis/5-alpine::30 +library/redis/6\ + library/redis/6-alpine::30 +library/redis/7\ + library/redis/7-alpine::30 +library/redis/alpine\ + library/redis/latest::30 " SKIP_REFRESH_ANCESTORS=${SKIP_REFRESH_ANCESTORS-} @@ -490,6 +495,10 @@ gen_image() { is_skipped() { local ret=1 t="$@" if [[ -z $SKIPPED_TAGS ]];then return 1;fi + if [[ -n "${PROTECTED_VERSIONS}" ]] && ( echo "$t" | grep -E -q "$PROTECTED_VERSIONS" );then + debug "$t is protected, no skip" + return 1 + fi if ( echo "$t" | grep -E -q "$SKIPPED_TAGS" );then ret=0 fi @@ -566,7 +575,7 @@ get_image_tags() { changed= if [[ "x${ONLY_ONE_MINOR}" != "x" ]] && ( echo $n | grep -E -q "$ONLY_ONE_MINOR" );then oomt="" - for ix in $(seq 0 30);do + for ix in $(seq 0 99);do if ! ( echo "$atags" | grep -E -q "^$ix\." );then continue;fi for j in $(seq 0 99);do if ! ( echo "$atags" | grep -E -q "^$ix\.${j}\." );then continue;fi @@ -589,10 +598,12 @@ get_image_tags() { fi if [[ -n "$selected" ]];then for l in $(echo "$selected"|sed -e "$ d");do - if [[ -z $oomt ]];then - oomt="$l$" - else - oomt="$oomt|$l" + if [[ -z "${PROTECTED_VERSIONS}" ]] || ! ( echo "$n:$l" | grep "${PROTECTED_VERSIONS}" );then + if [[ -z $oomt ]];then + oomt="$l$" + else + oomt="$oomt|$l" + fi fi done fi @@ -605,7 +616,7 @@ get_image_tags() { fi if [[ -z ${SKIP_TAGS_REBUILD} ]];then rm -f "$t" - filter_tags "$atags" > $t + filter_tags "$atags" > "$t" fi set -e if [ -e "$t" ];then cat "$t";fi