diff --git a/.github/workflows/continious-integration.yml b/.github/workflows/continious-integration.yml index f2a21d3..3dd8820 100644 --- a/.github/workflows/continious-integration.yml +++ b/.github/workflows/continious-integration.yml @@ -49,6 +49,12 @@ jobs: docker run --rm localhost/php-for-dev:8.0 php -v docker tag localhost/php-for-dev:8.0 dannecron/php-for-dev:8.0 echo "Done" + - name: Build the Docker images 8.1 + run: | + DOCKER_BUILDKIT=1 docker build --cache-from=dannecron/php-for-dev:8.1 --build-arg BUILDKIT_INLINE_CACHE=1 --tag=localhost/php-for-dev:8.1 ./v8.1 + docker run --rm localhost/php-for-dev:8.1 php -v + docker tag localhost/php-for-dev:8.1 dannecron/php-for-dev:8.1 + echo "Done" - name: push 7.2 image to docker hub if: success() @@ -74,6 +80,12 @@ jobs: with: args: push dannecron/php-for-dev:8.0 + - name: push 8.1 image to docker hub + if: success() + uses: actions-hub/docker@master + with: + args: push dannecron/php-for-dev:8.1 + - name: push latest image to docker hub if: success() uses: actions-hub/docker@master diff --git a/Makefile b/Makefile index f9a2495..d4b5826 100644 --- a/Makefile +++ b/Makefile @@ -9,3 +9,6 @@ build-74: build-80: cd ./v8.0 && docker build --tag=php-for-dev:8.0 `pwd` + +build-81: + cd ./v8.1 && docker build --tag=php-for-dev:8.1 `pwd` \ No newline at end of file diff --git a/readme.md b/readme.md index 4bac424..e2908ae 100644 --- a/readme.md +++ b/readme.md @@ -6,6 +6,9 @@ Images can be found on [docker hub](https://hub.docker.com/repository/docker/dan #### Supported versions +* php 8.1.0 + * composer 2.1.14 + * xdebug 3.1.0 * php 8.0.13 * composer 2.1.14 * xdebug 3.1.0 @@ -35,6 +38,7 @@ make build-72 make build-73 make build-74 make build-80 +make build-81 ``` #### Run @@ -42,10 +46,10 @@ make build-80 After making image run ```bash -docker run -it --rm -v `pwd`:/var/www/project -w /var/www/project --user=1000 php-for-dev:7.* sh +docker run -it --rm -v `pwd`:/var/www/project -w /var/www/project --user=1000 php-for-dev:M.m sh ``` -where replace `*` minor php version. +where replace `M` with major, and `m` with minor php version. ##### Using oh-my-zsh from local machine @@ -62,5 +66,5 @@ docker run -it --rm \ -v .oh-my-zsh:/home/user/oh-my-zsh \ -e HOME=/home/user \ -w /var/www/project \ - --user=1000 php-for-dev:7.* sh + --user=1000 php-for-dev:M.m sh ``` diff --git a/v8.1/Dockerfile b/v8.1/Dockerfile new file mode 100644 index 0000000..a6759c3 --- /dev/null +++ b/v8.1/Dockerfile @@ -0,0 +1,29 @@ +FROM php:8.1.0-alpine + +RUN apk update && apk add --no-cache $PHPIZE_DEPS \ + && apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \ + curl zip libzip-dev gmp-dev \ + imap-dev openssl-dev git zsh + +RUN docker-php-ext-configure gd --enable-gd \ + --with-freetype \ + --with-jpeg \ + --with-webp \ + && docker-php-ext-install gd \ + && docker-php-ext-configure bcmath && docker-php-ext-install bcmath \ + && docker-php-ext-configure zip --with-zip && docker-php-ext-install zip \ + && docker-php-ext-install gmp \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-imap-ssl \ + && docker-php-ext-install imap + +ARG PHP_XDEBUG_VERSION=3.1.2 +RUN pecl install xdebug-${PHP_XDEBUG_VERSION} && docker-php-ext-enable xdebug + +# Install composer +ARG COMPOSER_VERSION=2.1.14 +RUN curl -sS https://getcomposer.org/installer | php -- \ + --filename=composer \ + --version=${COMPOSER_VERSION} \ + --install-dir=/usr/local/bin +RUN mkdir -m 777 -p /var/composer/ +ENV COMPOSER_HOME /var/composer/