diff --git a/Makefile b/Makefile index 066c1770d..ff652aadb 100644 --- a/Makefile +++ b/Makefile @@ -191,7 +191,6 @@ versioned-images := php-8.1-fpm \ php-8.2-cli-drupal \ php-8.3-cli-drupal \ php-8.4-cli-drupal \ - python-3.8 \ python-3.9 \ python-3.10 \ python-3.11 \ @@ -299,7 +298,7 @@ build/php-8.1-cli-drupal: build/php-8.1-cli build/php-8.2-cli-drupal: build/php-8.2-cli build/php-8.3-cli-drupal: build/php-8.3-cli build/php-8.4-cli-drupal: build/php-8.4-cli -build/python-3.7 build/python-3.8 build/python-3.9 build/python-3.10 build/python-3.11 build/python-3.12 build/python-3.13: build/commons +build/python-3.9 build/python-3.10 build/python-3.11 build/python-3.12 build/python-3.13: build/commons build/node-18 build/node-20 build/node-22: build/commons build/node-18-builder build/node-18-cli: build/node-18 build/node-20-builder build/node-20-cli: build/node-20 diff --git a/images/python/3.8.Dockerfile b/images/python/3.8.Dockerfile deleted file mode 100644 index ac3d66fe8..000000000 --- a/images/python/3.8.Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons AS commons - -FROM python:3.8.20-alpine3.20 - -ARG LAGOON_VERSION -ENV LAGOON_VERSION=$LAGOON_VERSION -LABEL org.opencontainers.image.authors="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images/blob/main/images/python/3.8.Dockerfile" -LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images" -LABEL org.opencontainers.image.version="${LAGOON_VERSION}" -LABEL org.opencontainers.image.description="Python 3.8 image optimised for running in Lagoon in production and locally" -LABEL org.opencontainers.image.title="uselagoon/python-3.8" -LABEL org.opencontainers.image.base.name="docker.io/python:3.8-alpine3.20" - -LABEL sh.lagoon.image.deprecated.status="endoflife" -LABEL sh.lagoon.image.deprecated.suggested="docker.io/uselagoon/python-3.12" - -ENV LAGOON=python - -# Copy commons files -COPY --from=commons /lagoon /lagoon -COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/ -COPY --from=commons /sbin/tini /sbin/ -COPY --from=commons /home /home - -RUN fix-permissions /etc/passwd \ - && mkdir -p /home - -ENV TMPDIR=/tmp \ - TMP=/tmp \ - HOME=/home \ - # When Bash is invoked via `sh` it behaves like the old Bourne Shell and sources a file that is given in `ENV` - ENV=/home/.bashrc \ - # When Bash is invoked as non-interactive (like `bash -c command`) it sources a file that is given in `BASH_ENV` - BASH_ENV=/home/.bashrc - -RUN apk update \ - && apk add --no-cache --virtual .build-deps \ - build-base \ - && pip install --upgrade pip \ - && pip install virtualenv==16.7.10 \ - && apk del \ - .build-deps \ - && apk add --no-cache \ - rsync \ - tar \ - && rm -rf /var/cache/apk/* - -# Make sure shells are not running forever -COPY 80-shell-timeout.sh /lagoon/entrypoints/ -RUN echo "source /lagoon/entrypoints/80-shell-timeout.sh" >> /home/.bashrc - -ENTRYPOINT ["/sbin/tini", "--", "/lagoon/entrypoints.sh"] -CMD ["python"]