From 1bdcac67a544ee5ca327f7cce198f2be7b658b00 Mon Sep 17 00:00:00 2001 From: Dan Holmes Date: Wed, 10 Jan 2024 12:42:38 -0600 Subject: [PATCH] chore(dockerfile): remove Ruby 2.7 images after EOL https://github.com/articulate/docker-ruby/issues/75 --- 2.7-bullseye-slim-qt/Dockerfile | 45 --------------------- 2.7-bullseye-slim-qt/imagemagick-policy.xml | 32 --------------- 2.7-bullseye-slim/Dockerfile | 42 ------------------- 2.7-bullseye-slim/imagemagick-policy.xml | 32 --------------- 2.7-buster-slim-minimal/Dockerfile | 33 --------------- 2.7-buster-slim-qt/Dockerfile | 45 --------------------- 2.7-buster-slim-qt/imagemagick-policy.xml | 32 --------------- 2.7-buster-slim/Dockerfile | 44 -------------------- 2.7-buster-slim/imagemagick-policy.xml | 32 --------------- README.md | 5 --- 10 files changed, 342 deletions(-) delete mode 100644 2.7-bullseye-slim-qt/Dockerfile delete mode 100644 2.7-bullseye-slim-qt/imagemagick-policy.xml delete mode 100644 2.7-bullseye-slim/Dockerfile delete mode 100644 2.7-bullseye-slim/imagemagick-policy.xml delete mode 100644 2.7-buster-slim-minimal/Dockerfile delete mode 100644 2.7-buster-slim-qt/Dockerfile delete mode 100644 2.7-buster-slim-qt/imagemagick-policy.xml delete mode 100644 2.7-buster-slim/Dockerfile delete mode 100644 2.7-buster-slim/imagemagick-policy.xml diff --git a/2.7-bullseye-slim-qt/Dockerfile b/2.7-bullseye-slim-qt/Dockerfile deleted file mode 100644 index 33ff219..0000000 --- a/2.7-bullseye-slim-qt/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -# tags=articulate/articulate-ruby:2.7-bullseye-slim-qt -# syntax=docker/dockerfile:1 -FROM ruby:2.7-slim-bullseye - -ENV SERVICE_ROOT /service -ENV SERVICE_USER service - -ARG TARGETARCH -ARG AWSCLI_VERSION=2.11.15 -ADD --chmod=755 https://github.com/articulate/docker-bootstrap/releases/latest/download/docker-bootstrap_linux_${TARGETARCH} /entrypoint -ADD --chmod=755 https://raw.githubusercontent.com/vishnubob/wait-for-it/81b1373f17855a4dc21156cfe1694c31d7d1792e/wait-for-it.sh /wait-for-it.sh -ADD https://deb.nodesource.com/setup_16.x /tmp/setup-node.sh - -# - postgresql-client requires the presence of man pages for some reason. Debian-slim doesn't have those by default, so we have to add those as a stub (source: https://github.com/dalibo/temboard/issues/211) -# - we install Imagemagick in our base image so we can keep it updated in one place, and so we can add a strict security policy by default (see further down) -# - We want npm in our base image. To get it, we must install nodejs. There is one in apt-get, but it's super old (version ~4). To get a newer node we must first add the nodesource PPA. -# Source: https://github.com/nodesource/distributions/blob/master/README.md#deb -RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ - && bash /tmp/setup-node.sh \ - && apt-get update -qq \ - && apt-get install --no-install-recommends -y \ - build-essential imagemagick git wget curl xvfb binutils jq sudo unzip \ - qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5webkit5-dev \ - ca-certificates libyaml-dev libpq-dev nodejs postgresql-client \ - && apt-get upgrade -y \ - && apt-get clean \ - && ln -s /entrypoint /entrypoint.sh \ - # AWSCLI (to be removed in a future release) - && curl -s "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m)-${AWSCLI_VERSION}.zip" -o /tmp/awscliv2.zip \ - && unzip -d /tmp /tmp/awscliv2.zip \ - && /tmp/aws/install \ - # Create our service group and user - && groupadd $SERVICE_USER && useradd --create-home --home $SERVICE_ROOT --gid $SERVICE_USER --shell /bin/bash $SERVICE_USER \ - # cleanup - && rm -rf /var/lib/apt/lists/* /usr/share/doc /root/.cache/ /tmp/* - -# Add a strict security policy for Imagemagick -COPY imagemagick-policy.xml /etc/ImageMagick-8/policy.xml - -WORKDIR $SERVICE_ROOT - -# Our entrypoint will pull in our environment variables from Consul and Vault -# and execute whatever command we provided the container. -# See https://github.com/articulate/docker-bootstrap -ENTRYPOINT [ "/entrypoint" ] diff --git a/2.7-bullseye-slim-qt/imagemagick-policy.xml b/2.7-bullseye-slim-qt/imagemagick-policy.xml deleted file mode 100644 index 0d613bd..0000000 --- a/2.7-bullseye-slim-qt/imagemagick-policy.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/2.7-bullseye-slim/Dockerfile b/2.7-bullseye-slim/Dockerfile deleted file mode 100644 index 6b9db8d..0000000 --- a/2.7-bullseye-slim/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -# tags=articulate/articulate-ruby:2.7-bullseye-slim -# syntax=docker/dockerfile:1 -FROM ruby:2.7-slim-bullseye - -ENV SERVICE_ROOT /service -ENV SERVICE_USER service - -ARG TARGETARCH -ARG AWSCLI_VERSION=2.11.15 -ADD --chmod=755 https://github.com/articulate/docker-bootstrap/releases/latest/download/docker-bootstrap_linux_${TARGETARCH} /entrypoint -ADD --chmod=755 https://raw.githubusercontent.com/vishnubob/wait-for-it/81b1373f17855a4dc21156cfe1694c31d7d1792e/wait-for-it.sh /wait-for-it.sh -ADD https://deb.nodesource.com/setup_16.x /tmp/setup-node.sh - -# - we install Imagemagick in our base image so we can keep it updated in one place, and so we can add a strict security policy by default (see further down) -# - We want npm in our base image. To get it, we must install nodejs. There is one in apt-get, but it's super old (version ~4). To get a newer node we must first add the nodesource PPA. -# Source: https://github.com/nodesource/distributions/blob/master/README.md#deb -RUN bash /tmp/setup-node.sh \ - && apt-get update -qq \ - && apt-get install --no-install-recommends -y \ - build-essential imagemagick git wget curl binutils jq sudo unzip \ - ca-certificates libyaml-dev libpq-dev nodejs postgresql-client \ - && apt-get upgrade -y \ - && apt-get clean \ - && ln -s /entrypoint /entrypoint.sh \ - # AWSCLI (to be removed in a future release) - && curl -s "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m)-${AWSCLI_VERSION}.zip" -o /tmp/awscliv2.zip \ - && unzip -d /tmp /tmp/awscliv2.zip \ - && /tmp/aws/install \ - # Create our service group and user - && groupadd $SERVICE_USER && useradd --create-home --home $SERVICE_ROOT --gid $SERVICE_USER --shell /bin/bash $SERVICE_USER \ - # cleanup - && rm -rf /var/lib/apt/lists/* /usr/share/doc /root/.cache/ /tmp/* - -# Add a strict security policy for Imagemagick (note: Imagemagick 7 is currently not available in Debian) -COPY imagemagick-policy.xml /etc/ImageMagick-6/policy.xml - -WORKDIR $SERVICE_ROOT - -# Our entrypoint will pull in our environment variables from Consul and Vault -# and execute whatever command we provided the container. -# See https://github.com/articulate/docker-bootstrap -ENTRYPOINT [ "/entrypoint" ] diff --git a/2.7-bullseye-slim/imagemagick-policy.xml b/2.7-bullseye-slim/imagemagick-policy.xml deleted file mode 100644 index 32ce2c6..0000000 --- a/2.7-bullseye-slim/imagemagick-policy.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - diff --git a/2.7-buster-slim-minimal/Dockerfile b/2.7-buster-slim-minimal/Dockerfile deleted file mode 100644 index a38fac1..0000000 --- a/2.7-buster-slim-minimal/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -# tags=articulate/articulate-ruby:2.7-buster-slim-minimal -# syntax=docker/dockerfile:1 -FROM ruby:2.7-slim-buster - -ENV SERVICE_ROOT /service -ENV SERVICE_USER service - -ARG TARGETARCH -ARG AWSCLI_VERSION=2.11.15 -ADD --chmod=755 https://github.com/articulate/docker-bootstrap/releases/latest/download/docker-bootstrap_linux_${TARGETARCH} /entrypoint -ADD --chmod=755 https://raw.githubusercontent.com/vishnubob/wait-for-it/81b1373f17855a4dc21156cfe1694c31d7d1792e/wait-for-it.sh /wait-for-it.sh - -RUN apt-get update -qq \ - && apt-get install --no-install-recommends -y \ - make git wget curl xvfb binutils jq sudo unzip ca-certificates \ - && apt-get upgrade -y \ - && apt-get clean \ - && ln -s /entrypoint /entrypoint.sh \ - # AWSCLI (to be removed in a future release) - && curl -s "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m)-${AWSCLI_VERSION}.zip" -o /tmp/awscliv2.zip \ - && unzip -d /tmp /tmp/awscliv2.zip \ - && /tmp/aws/install \ - # Create our service group and user - && groupadd $SERVICE_USER && useradd --create-home --home $SERVICE_ROOT --gid $SERVICE_USER --shell /bin/bash $SERVICE_USER \ - # Cleanup - && rm -rf /var/lib/apt/lists/* /usr/share/doc /root/.cache/ /tmp/* - -WORKDIR $SERVICE_ROOT - -# Our entrypoint will pull in our environment variables from Consul and Vault -# and execute whatever command we provided the container. -# See https://github.com/articulate/docker-bootstrap -ENTRYPOINT [ "/entrypoint" ] diff --git a/2.7-buster-slim-qt/Dockerfile b/2.7-buster-slim-qt/Dockerfile deleted file mode 100644 index 1e162e8..0000000 --- a/2.7-buster-slim-qt/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -# tags=articulate/articulate-ruby:2.7-buster-slim-qt -# syntax=docker/dockerfile:1 -FROM ruby:2.7-slim-buster - -ENV SERVICE_ROOT /service -ENV SERVICE_USER service - -ARG TARGETARCH -ARG AWSCLI_VERSION=2.11.15 -ADD --chmod=755 https://github.com/articulate/docker-bootstrap/releases/latest/download/docker-bootstrap_linux_${TARGETARCH} /entrypoint -ADD --chmod=755 https://raw.githubusercontent.com/vishnubob/wait-for-it/81b1373f17855a4dc21156cfe1694c31d7d1792e/wait-for-it.sh /wait-for-it.sh -ADD https://deb.nodesource.com/setup_12.x /tmp/setup-node.sh - -# - postgresql-client requires the presence of man pages for some reason. Debian-slim doesn't have those by default, so we have to add those as a stub (source: https://github.com/dalibo/temboard/issues/211) -# - we install Imagemagick in our base image so we can keep it updated in one place, and so we can add a strict security policy by default (see further down) -# - We want npm in our base image. To get it, we must install nodejs. There is one in apt-get, but it's super old (version ~4). To get a newer node we must first add the nodesource PPA. -# Source: https://github.com/nodesource/distributions/blob/master/README.md#deb -RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ - && bash /tmp/setup-node.sh \ - && apt-get update -qq \ - && apt-get install --no-install-recommends -y \ - build-essential imagemagick git wget curl binutils jq sudo unzip \ - qt5-default libqt5webkit5-dev libyaml-dev libpq-dev postgresql-client \ - ca-certificates nodejs \ - && apt-get upgrade -y \ - && apt-get clean \ - && ln -s /entrypoint /entrypoint.sh \ - # AWSCLI (to be removed in a future release) - && curl -s "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m)-${AWSCLI_VERSION}.zip" -o /tmp/awscliv2.zip \ - && unzip -d /tmp /tmp/awscliv2.zip \ - && /tmp/aws/install \ - # Create our service group and user - && groupadd $SERVICE_USER && useradd --create-home --home $SERVICE_ROOT --gid $SERVICE_USER --shell /bin/bash $SERVICE_USER \ - # cleanup - && rm -rf /var/lib/apt/lists/* /usr/share/doc /root/.cache/ /tmp/* - -# Add a strict security policy for Imagemagick (note: Imagemagick 7 is currently not available in Debian) -COPY imagemagick-policy.xml /etc/ImageMagick-6/policy.xml - -WORKDIR $SERVICE_ROOT - -# Our entrypoint will pull in our environment variables from Consul and Vault -# and execute whatever command we provided the container. -# See https://github.com/articulate/docker-bootstrap -ENTRYPOINT [ "/entrypoint" ] diff --git a/2.7-buster-slim-qt/imagemagick-policy.xml b/2.7-buster-slim-qt/imagemagick-policy.xml deleted file mode 100644 index 32ce2c6..0000000 --- a/2.7-buster-slim-qt/imagemagick-policy.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - diff --git a/2.7-buster-slim/Dockerfile b/2.7-buster-slim/Dockerfile deleted file mode 100644 index 567182c..0000000 --- a/2.7-buster-slim/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -# tags=articulate/articulate-ruby:2.7-buster-slim -# syntax=docker/dockerfile:1 -FROM ruby:2.7-slim-buster - -ENV SERVICE_ROOT /service -ENV SERVICE_USER service - -ARG TARGETARCH -ARG AWSCLI_VERSION=2.11.15 -ADD --chmod=755 https://github.com/articulate/docker-bootstrap/releases/latest/download/docker-bootstrap_linux_${TARGETARCH} /entrypoint -ADD --chmod=755 https://raw.githubusercontent.com/vishnubob/wait-for-it/81b1373f17855a4dc21156cfe1694c31d7d1792e/wait-for-it.sh /wait-for-it.sh -ADD https://deb.nodesource.com/setup_12.x /tmp/setup-node.sh - -# - postgresql-client requires the presence of man pages for some reason. Debian-slim doesn't have those by default, so we have to add those as a stub (source: https://github.com/dalibo/temboard/issues/211) -# - we install Imagemagick in our base image so we can keep it updated in one place, and so we can add a strict security policy by default (see further down) -# - We want npm in our base image. To get it, we must install nodejs. There is one in apt-get, but it's super old (version ~4). To get a newer node we must first add the nodesource PPA. -# Source: https://github.com/nodesource/distributions/blob/master/README.md#deb -RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ - && bash /tmp/setup-node.sh \ - && apt-get update -qq \ - && apt-get install --no-install-recommends -y \ - build-essential imagemagick git wget curl binutils jq sudo unzip \ - ca-certificates libyaml-dev libpq-dev postgresql-client nodejs \ - && apt-get upgrade -y \ - && apt-get clean \ - && ln -s /entrypoint /entrypoint.sh \ - # AWSCLI (to be removed in a future release) - && curl -s "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m)-${AWSCLI_VERSION}.zip" -o /tmp/awscliv2.zip \ - && unzip -d /tmp /tmp/awscliv2.zip \ - && /tmp/aws/install \ - # Create our service group and user - && groupadd $SERVICE_USER && useradd --create-home --home $SERVICE_ROOT --gid $SERVICE_USER --shell /bin/bash $SERVICE_USER \ - # cleanup - && rm -rf /var/lib/apt/lists/* /usr/share/doc /root/.cache/ /tmp/* - -# Add a strict security policy for Imagemagick (note: Imagemagick 7 is currently not available in Debian) -COPY imagemagick-policy.xml /etc/ImageMagick-6/policy.xml - -WORKDIR $SERVICE_ROOT - -# Our entrypoint will pull in our environment variables from Consul and Vault -# and execute whatever command we provided the container. -# See https://github.com/articulate/docker-bootstrap -ENTRYPOINT [ "/entrypoint" ] diff --git a/2.7-buster-slim/imagemagick-policy.xml b/2.7-buster-slim/imagemagick-policy.xml deleted file mode 100644 index 32ce2c6..0000000 --- a/2.7-buster-slim/imagemagick-policy.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - diff --git a/README.md b/README.md index eb74765..81fa183 100644 --- a/README.md +++ b/README.md @@ -27,11 +27,6 @@ Base Ruby images for Articulate services. * articulate/articulate-ruby:3.1-bullseye-slim-minimal * articulate/articulate-ruby:3.1-bullseye-slim * articulate/articulate-ruby:3.1-bullseye-slim-qt -* articulate/articulate-ruby:2.7-bullseye-slim -* articulate/articulate-ruby:2.7-bullseye-slim-qt -* articulate/articulate-ruby:2.7-buster-slim-minimal -* articulate/articulate-ruby:2.7-buster-slim -* articulate/articulate-ruby:2.7-buster-slim-qt ### articulate/ruby vs articulate/articulate-ruby