From dabd4611534046b9ab3b340a59632d92bf9caeba Mon Sep 17 00:00:00 2001 From: Alexis Lefebvre Date: Sun, 26 Feb 2023 12:37:13 +0100 Subject: [PATCH] remove obsolete images --- .github/workflows/push.yaml | 3 --- .github/workflows/test.yaml | 3 --- 5.4-composer/Dockerfile | 28 --------------------------- 5.4-composer/README.md | 28 --------------------------- README.md | 3 --- jakzal-phpqa-gd/Dockerfile | 5 ----- jakzal-phpqa-gd/README.md | 12 ------------ php-7.4-alpine-composer-gd/Dockerfile | 22 --------------------- php-7.4-alpine-composer-gd/README.md | 14 -------------- 9 files changed, 118 deletions(-) delete mode 100644 5.4-composer/Dockerfile delete mode 100644 5.4-composer/README.md delete mode 100644 jakzal-phpqa-gd/Dockerfile delete mode 100644 jakzal-phpqa-gd/README.md delete mode 100644 php-7.4-alpine-composer-gd/Dockerfile delete mode 100644 php-7.4-alpine-composer-gd/README.md diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index a25f4da..2fa704d 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -15,10 +15,7 @@ jobs: fail-fast: false matrix: image: - - 5.4-composer - alpine-wait-for-it - - jakzal-phpqa-gd - - php-7.4-alpine-composer-gd - php-8.1-alpine-composer-gd - php-8.1-jakzal-phpqa-gd diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index fc3983e..d922f0f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -15,10 +15,7 @@ jobs: fail-fast: false matrix: image: - - 5.4-composer - alpine-wait-for-it - - jakzal-phpqa-gd - - php-7.4-alpine-composer-gd - php-8.1-alpine-composer-gd - php-8.1-jakzal-phpqa-gd diff --git a/5.4-composer/Dockerfile b/5.4-composer/Dockerfile deleted file mode 100644 index b2d2f7f..0000000 --- a/5.4-composer/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -# adapted from https://github.com/alterway/docker-php/blob/f1695cc9bb099fcbc2ec5dc104c12b2fa3bb0daa/5.4-cli/Dockerfile - -FROM php:5.4-cli - -# git and unzip are necessary for Composer, libicu-dev is necessary for internationalization -RUN apt-get update && \ - apt-get install -y \ - git \ - unzip \ - libicu-dev && \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/ - -RUN docker-php-ext-install intl && \ - docker-php-ext-configure intl && \ - docker-php-ext-install mbstring && \ - docker-php-ext-install pcntl && \ - docker-php-ext-install pdo_mysql - -ENV COMPOSER_ALLOW_SUPERUSER=1 - -# copy Composer from official image -COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer - -# avoid error “Warning: date_default_timezone_get(): It is not safe to rely on the system's timezone settings.” -# source: https://stackoverflow.com/questions/45587214/configure-timezone-in-dockerized-nginx-php-fpm/45587945#45587945 -RUN printf '[PHP]\ndate.timezone = "Europe/Paris"\n' > /usr/local/etc/php/conf.d/tzone.ini - -WORKDIR /app diff --git a/5.4-composer/README.md b/5.4-composer/README.md deleted file mode 100644 index 2a4e625..0000000 --- a/5.4-composer/README.md +++ /dev/null @@ -1,28 +0,0 @@ -# PHP 5.4 with Composer - -Use this image with Drone by using this `.drone.yml`: - -```yml -pipeline: - test: - image: ghcr.io/alexislefebvre/5.4-composer - volumes: - - composer-cache:/root/.composer - commands: - - composer install -vv --profile --no-progress - - php vendor/bin/phpunit - environment: - - SYMFONY_ENV=test -``` - -If you have this error when running Composer: - -```bash -Fatal error: Allowed memory size of 1610612736 bytes exhausted (tried to allocate 32 bytes) in phar:///usr/local/bin/composer/src/Composer/DependencyResolver/RuleSetGenerator.php on line 126`: -``` - -Set the `memory_limit` to `-1` to disable the limit: - -```bash -docker run -it --volume $PWD:/app --workdir /app alexislefebvre/docker-images:5.4-composer php --define memory_limit=-1 /usr/local/bin/composer update -vvv -``` diff --git a/README.md b/README.md index 8f97b39..f27251e 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,6 @@ Images: -- [5.4-composer](5.4-composer/): Use this image with Drone for legacy projects - [alpine-wait-for-it](alpine-wait-for-it/): Use this image with Drone to wait for another service -- [jakzal-phpqa-gd](jakzal-phpqa-gd/): Use this image with Drone to avoid error from PHPStan when GD functions are used -- [php-7.4-alpine-composer-gd](php-7.4-alpine-composer-gd): Use this image with GitHub actions or Drone - [php-8.1-alpine-composer-gd](php-8.1-alpine-composer-gd): Use this image with GitHub actions or Drone - [php-8.1-jakzal-phpqa-gd](php-8.1-jakzal-phpqa-gd): Use this image with GitHub actions or Drone diff --git a/jakzal-phpqa-gd/Dockerfile b/jakzal-phpqa-gd/Dockerfile deleted file mode 100644 index 98b7de0..0000000 --- a/jakzal-phpqa-gd/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM jakzal/phpqa:php7.4-alpine - -RUN apk add --no-cache freetype-dev libjpeg-turbo-dev libpng-dev \ - && docker-php-ext-configure gd --with-freetype --with-jpeg \ - && docker-php-ext-install -j$(nproc) gd diff --git a/jakzal-phpqa-gd/README.md b/jakzal-phpqa-gd/README.md deleted file mode 100644 index b68ba8d..0000000 --- a/jakzal-phpqa-gd/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# jakzal/pqpqa with GD - -Use this image with Drone by using this `.drone.yml`: - -```yml -pipeline: - phpstan: - image: ghcr.io/alexislefebvre/jakzal-phpqa-gd - group: tests - commands: - - phpstan analyse --level 6 src/ --no-progress -``` diff --git a/php-7.4-alpine-composer-gd/Dockerfile b/php-7.4-alpine-composer-gd/Dockerfile deleted file mode 100644 index 1c187c1..0000000 --- a/php-7.4-alpine-composer-gd/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM php:7.4-cli-alpine - -ENV COMPOSER_ALLOW_SUPERUSER=1 - -# copy Composer from official image -COPY --from=composer:2 /usr/bin/composer /usr/bin/composer - -# git and unzip are necessary for Composer, mysql-client will install “mysqldump” command -RUN apk add --no-cache git unzip mysql-client \ - freetype-dev libjpeg-turbo-dev libpng-dev \ - && docker-php-ext-configure gd --with-freetype --with-jpeg \ - && docker-php-ext-install -j$(nproc) gd \ - && docker-php-ext-install pdo_mysql - -RUN apk add --no-cache --virtual .build-deps $PHPIZE_DEPS icu-dev \ - && apk add --no-cache libintl \ - && docker-php-ext-install intl - -# necessary for code coverage -RUN apk add --no-cache autoconf gcc g++ make \ - && pecl install pcov && docker-php-ext-enable pcov \ - && echo "pcov.enabled=0" >> $PHP_INI_DIR/php.ini diff --git a/php-7.4-alpine-composer-gd/README.md b/php-7.4-alpine-composer-gd/README.md deleted file mode 100644 index 16e0de6..0000000 --- a/php-7.4-alpine-composer-gd/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# PHP 7.4 from Alpine Linux with Composer and GD - -Use this image with Drone by using this `.drone.yml`: - -```yml -pipeline: - test: - image: ghcr.io/alexislefebvre/php-7.4-alpine-composer-gd - volumes: - - composer-cache:/root/.composer - commands: - - composer install -vv --profile --no-progress - - php vendor/bin/phpunit -```