From b660c3f4b9b8e1f4157d3e1eef5a81f73da39fa0 Mon Sep 17 00:00:00 2001 From: MilesChou Date: Fri, 9 Dec 2022 15:46:19 +0800 Subject: [PATCH] Add PHP 8.2 support --- .github/workflows/docker_hub_registry.yml | 24 ++++----- .../workflows/github_container_registry.yml | 24 ++++----- 7.2/Dockerfile | 2 +- 7.2/alpine/Dockerfile | 2 +- 7.2/apache/Dockerfile | 2 +- 7.3/Dockerfile | 2 +- 7.3/alpine/Dockerfile | 2 +- 7.3/apache/Dockerfile | 2 +- 7.4/Dockerfile | 2 +- 7.4/alpine/Dockerfile | 2 +- 7.4/apache/Dockerfile | 2 +- 8.0/alpine/Dockerfile | 1 + 8.1/alpine/Dockerfile | 1 + 8.2/Dockerfile | 21 ++++++++ 8.2/alpine/Dockerfile | 28 ++++++++++ 8.2/apache/Dockerfile | 21 ++++++++ Dockerfile-alpine-8.template | 23 ++++++++ Makefile | 54 +++++++++++-------- README.md | 12 +++-- update.sh | 38 ++++++++----- 20 files changed, 194 insertions(+), 71 deletions(-) create mode 100644 8.2/Dockerfile create mode 100644 8.2/alpine/Dockerfile create mode 100644 8.2/apache/Dockerfile create mode 100644 Dockerfile-alpine-8.template diff --git a/.github/workflows/docker_hub_registry.yml b/.github/workflows/docker_hub_registry.yml index 21c4c0b..c8c7584 100644 --- a/.github/workflows/docker_hub_registry.yml +++ b/.github/workflows/docker_hub_registry.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@master - name: Build latest CLI version and publish - uses: elgohr/Publish-Docker-Github-Action@3.04 + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: mileschou/xdebug - tags: "latest,cli,8.1" + tags: "latest,cli,8.2" username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_PASSWORD }} dockerfile: 8.1/Dockerfile @@ -25,10 +25,10 @@ jobs: steps: - uses: actions/checkout@master - name: Build latest Alpine version and publish - uses: elgohr/Publish-Docker-Github-Action@3.04 + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: mileschou/xdebug - tags: "alpine,8.1-alpine" + tags: "alpine,8.2-alpine" username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_PASSWORD }} dockerfile: 8.1/alpine/Dockerfile @@ -38,10 +38,10 @@ jobs: steps: - uses: actions/checkout@master - name: Build latest Apache version and publish - uses: elgohr/Publish-Docker-Github-Action@3.04 + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: mileschou/xdebug - tags: "apache,8.1-apache" + tags: "apache,8.2-apache" username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_PASSWORD }} dockerfile: 8.1/apache/Dockerfile @@ -50,11 +50,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: ["8.0", "7.4", "7.3", "7.2", "7.1", "7.0", "5.6", "5.5"] + version: ["8.1", "8.0", "7.4", "7.3", "7.2", "7.1", "7.0", "5.6", "5.5"] steps: - uses: actions/checkout@master - name: Build PHP ${{ matrix.version }} CLI and publish - uses: elgohr/Publish-Docker-Github-Action@3.04 + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: mileschou/xdebug tags: ${{ matrix.version }},${{ matrix.version }}-cli @@ -66,11 +66,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: ["8.0", "7.4", "7.3", "7.2", "7.1", "7.0", "5.6", "5.5"] + version: ["8.1", "8.0", "7.4", "7.3", "7.2", "7.1", "7.0", "5.6", "5.5"] steps: - uses: actions/checkout@master - name: Build PHP ${{ matrix.version }} Alpine and publish - uses: elgohr/Publish-Docker-Github-Action@3.04 + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: mileschou/xdebug:${{ matrix.version }}-alpine username: ${{ secrets.DOCKER_HUB_USERNAME }} @@ -81,11 +81,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: ["8.0", "7.4", "7.3", "7.2", "7.1", "7.0", "5.6", "5.5"] + version: ["8.1", "8.0", "7.4", "7.3", "7.2", "7.1", "7.0", "5.6", "5.5"] steps: - uses: actions/checkout@master - name: Build PHP ${{ matrix.version }} Apache and publish - uses: elgohr/Publish-Docker-Github-Action@3.04 + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: mileschou/xdebug:${{ matrix.version }}-apache username: ${{ secrets.DOCKER_HUB_USERNAME }} diff --git a/.github/workflows/github_container_registry.yml b/.github/workflows/github_container_registry.yml index 5cb34b0..01f7a28 100644 --- a/.github/workflows/github_container_registry.yml +++ b/.github/workflows/github_container_registry.yml @@ -14,10 +14,10 @@ jobs: steps: - uses: actions/checkout@master - name: Build latest CLI version and publish - uses: elgohr/Publish-Docker-Github-Action@3.04 + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: mileschou/xdebug - tags: "latest,8.1" + tags: "latest,8.2" username: mileschou password: ${{ secrets.GITHUB_TOKEN }} registry: ghcr.io @@ -28,10 +28,10 @@ jobs: steps: - uses: actions/checkout@master - name: Build latest Alpine version and publish - uses: elgohr/Publish-Docker-Github-Action@3.04 + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: mileschou/xdebug - tags: "alpine,8.1-alpine" + tags: "alpine,8.2-alpine" username: mileschou password: ${{ secrets.GITHUB_TOKEN }} registry: ghcr.io @@ -42,10 +42,10 @@ jobs: steps: - uses: actions/checkout@master - name: Build latest Apache version and publish - uses: elgohr/Publish-Docker-Github-Action@3.04 + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: mileschou/xdebug - tags: "apache,8.1-apache" + tags: "apache,8.2-apache" username: mileschou password: ${{ secrets.GITHUB_TOKEN }} registry: ghcr.io @@ -55,11 +55,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: ["8.0", "7.4", "7.3", "7.2", "7.1", "7.0", "5.6", "5.5"] + version: ["8.1", "8.0", "7.4", "7.3", "7.2", "7.1", "7.0", "5.6", "5.5"] steps: - uses: actions/checkout@master - name: Build PHP ${{ matrix.version }} CLI and publish - uses: elgohr/Publish-Docker-Github-Action@3.04 + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: mileschou/xdebug tags: ${{ matrix.version }},${{ matrix.version }}-cli @@ -72,11 +72,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: ["8.0", "7.4", "7.3", "7.2", "7.1", "7.0", "5.6", "5.5"] + version: ["8.1", "8.0", "7.4", "7.3", "7.2", "7.1", "7.0", "5.6", "5.5"] steps: - uses: actions/checkout@master - name: Build PHP ${{ matrix.version }} Alpine and publish - uses: elgohr/Publish-Docker-Github-Action@3.04 + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: mileschou/xdebug:${{ matrix.version }}-alpine username: mileschou @@ -88,11 +88,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: ["8.0", "7.4", "7.3", "7.2", "7.1", "7.0", "5.6", "5.5"] + version: ["8.1", "8.0", "7.4", "7.3", "7.2", "7.1", "7.0", "5.6", "5.5"] steps: - uses: actions/checkout@master - name: Build PHP ${{ matrix.version }} Apache and publish - uses: elgohr/Publish-Docker-Github-Action@3.04 + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: mileschou/xdebug:${{ matrix.version }}-apache username: mileschou diff --git a/7.2/Dockerfile b/7.2/Dockerfile index 98e6eda..9cd197d 100644 --- a/7.2/Dockerfile +++ b/7.2/Dockerfile @@ -12,7 +12,7 @@ LABEL org.opencontainers.image.source="https://github.com/MilesChou/docker-xdebu # install xdebug RUN set -xe && \ docker-php-source extract && \ - pecl install xdebug && \ + pecl install xdebug-3.1.6 && \ docker-php-ext-enable xdebug && \ docker-php-source delete && \ php -v && \ diff --git a/7.2/alpine/Dockerfile b/7.2/alpine/Dockerfile index e178d1c..dcedf9b 100644 --- a/7.2/alpine/Dockerfile +++ b/7.2/alpine/Dockerfile @@ -17,7 +17,7 @@ RUN set -xe && \ g++ \ make \ && \ - pecl install xdebug && \ + pecl install xdebug-3.1.6 && \ docker-php-ext-enable xdebug && \ docker-php-source delete && \ apk del .build-deps && \ diff --git a/7.2/apache/Dockerfile b/7.2/apache/Dockerfile index 806626d..0c5d50f 100644 --- a/7.2/apache/Dockerfile +++ b/7.2/apache/Dockerfile @@ -12,7 +12,7 @@ LABEL org.opencontainers.image.source="https://github.com/MilesChou/docker-xdebu # install xdebug RUN set -xe && \ docker-php-source extract && \ - pecl install xdebug && \ + pecl install xdebug-3.1.6 && \ docker-php-ext-enable xdebug && \ docker-php-source delete && \ php -v && \ diff --git a/7.3/Dockerfile b/7.3/Dockerfile index cbf875f..6cd23a6 100644 --- a/7.3/Dockerfile +++ b/7.3/Dockerfile @@ -12,7 +12,7 @@ LABEL org.opencontainers.image.source="https://github.com/MilesChou/docker-xdebu # install xdebug RUN set -xe && \ docker-php-source extract && \ - pecl install xdebug && \ + pecl install xdebug-3.1.6 && \ docker-php-ext-enable xdebug && \ docker-php-source delete && \ php -v && \ diff --git a/7.3/alpine/Dockerfile b/7.3/alpine/Dockerfile index d2b8105..95bf17e 100644 --- a/7.3/alpine/Dockerfile +++ b/7.3/alpine/Dockerfile @@ -17,7 +17,7 @@ RUN set -xe && \ g++ \ make \ && \ - pecl install xdebug && \ + pecl install xdebug-3.1.6 && \ docker-php-ext-enable xdebug && \ docker-php-source delete && \ apk del .build-deps && \ diff --git a/7.3/apache/Dockerfile b/7.3/apache/Dockerfile index 165ec59..6693ade 100644 --- a/7.3/apache/Dockerfile +++ b/7.3/apache/Dockerfile @@ -12,7 +12,7 @@ LABEL org.opencontainers.image.source="https://github.com/MilesChou/docker-xdebu # install xdebug RUN set -xe && \ docker-php-source extract && \ - pecl install xdebug && \ + pecl install xdebug-3.1.6 && \ docker-php-ext-enable xdebug && \ docker-php-source delete && \ php -v && \ diff --git a/7.4/Dockerfile b/7.4/Dockerfile index b439eea..045fa34 100644 --- a/7.4/Dockerfile +++ b/7.4/Dockerfile @@ -12,7 +12,7 @@ LABEL org.opencontainers.image.source="https://github.com/MilesChou/docker-xdebu # install xdebug RUN set -xe && \ docker-php-source extract && \ - pecl install xdebug && \ + pecl install xdebug-3.1.6 && \ docker-php-ext-enable xdebug && \ docker-php-source delete && \ php -v && \ diff --git a/7.4/alpine/Dockerfile b/7.4/alpine/Dockerfile index f0b0456..da4f543 100644 --- a/7.4/alpine/Dockerfile +++ b/7.4/alpine/Dockerfile @@ -17,7 +17,7 @@ RUN set -xe && \ g++ \ make \ && \ - pecl install xdebug && \ + pecl install xdebug-3.1.6 && \ docker-php-ext-enable xdebug && \ docker-php-source delete && \ apk del .build-deps && \ diff --git a/7.4/apache/Dockerfile b/7.4/apache/Dockerfile index 9e73488..4d6445c 100644 --- a/7.4/apache/Dockerfile +++ b/7.4/apache/Dockerfile @@ -12,7 +12,7 @@ LABEL org.opencontainers.image.source="https://github.com/MilesChou/docker-xdebu # install xdebug RUN set -xe && \ docker-php-source extract && \ - pecl install xdebug && \ + pecl install xdebug-3.1.6 && \ docker-php-ext-enable xdebug && \ docker-php-source delete && \ php -v && \ diff --git a/8.0/alpine/Dockerfile b/8.0/alpine/Dockerfile index 7718251..f7dcd10 100644 --- a/8.0/alpine/Dockerfile +++ b/8.0/alpine/Dockerfile @@ -15,6 +15,7 @@ RUN set -xe && \ apk add --no-cache --virtual .build-deps \ autoconf \ g++ \ + linux-headers \ make \ && \ pecl install xdebug && \ diff --git a/8.1/alpine/Dockerfile b/8.1/alpine/Dockerfile index 4c632f3..a2934c1 100644 --- a/8.1/alpine/Dockerfile +++ b/8.1/alpine/Dockerfile @@ -15,6 +15,7 @@ RUN set -xe && \ apk add --no-cache --virtual .build-deps \ autoconf \ g++ \ + linux-headers \ make \ && \ pecl install xdebug && \ diff --git a/8.2/Dockerfile b/8.2/Dockerfile new file mode 100644 index 0000000..3854d23 --- /dev/null +++ b/8.2/Dockerfile @@ -0,0 +1,21 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM php:8.2 + +LABEL org.opencontainers.image.source="https://github.com/MilesChou/docker-xdebug" \ + repository="https://github.com/MilesChou/docker-xdebug" \ + maintainer="MilesChou " + +# install xdebug +RUN set -xe && \ + docker-php-source extract && \ + pecl install xdebug && \ + docker-php-ext-enable xdebug && \ + docker-php-source delete && \ + php -v && \ + php -m + +COPY docker-xdebug-* /usr/local/bin/ diff --git a/8.2/alpine/Dockerfile b/8.2/alpine/Dockerfile new file mode 100644 index 0000000..7455766 --- /dev/null +++ b/8.2/alpine/Dockerfile @@ -0,0 +1,28 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM php:8.2-alpine + +LABEL org.opencontainers.image.source="https://github.com/MilesChou/docker-xdebug" \ + repository="https://github.com/MilesChou/docker-xdebug" \ + maintainer="MilesChou " + +# install xdebug +RUN set -xe && \ + docker-php-source extract && \ + apk add --no-cache --virtual .build-deps \ + autoconf \ + g++ \ + linux-headers \ + make \ + && \ + pecl install xdebug && \ + docker-php-ext-enable xdebug && \ + docker-php-source delete && \ + apk del .build-deps && \ + php -v && \ + php -m + +COPY docker-xdebug-* /usr/local/bin/ diff --git a/8.2/apache/Dockerfile b/8.2/apache/Dockerfile new file mode 100644 index 0000000..6c3496c --- /dev/null +++ b/8.2/apache/Dockerfile @@ -0,0 +1,21 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM php:8.2-apache + +LABEL org.opencontainers.image.source="https://github.com/MilesChou/docker-xdebug" \ + repository="https://github.com/MilesChou/docker-xdebug" \ + maintainer="MilesChou " + +# install xdebug +RUN set -xe && \ + docker-php-source extract && \ + pecl install xdebug && \ + docker-php-ext-enable xdebug && \ + docker-php-source delete && \ + php -v && \ + php -m + +COPY docker-xdebug-* /usr/local/bin/ diff --git a/Dockerfile-alpine-8.template b/Dockerfile-alpine-8.template new file mode 100644 index 0000000..e9c96ba --- /dev/null +++ b/Dockerfile-alpine-8.template @@ -0,0 +1,23 @@ +FROM php:%%PHP_VERSION%% + +LABEL org.opencontainers.image.source="https://github.com/MilesChou/docker-xdebug" \ + repository="https://github.com/MilesChou/docker-xdebug" \ + maintainer="MilesChou " + +# install xdebug +RUN set -xe && \ + docker-php-source extract && \ + apk add --no-cache --virtual .build-deps \ + autoconf \ + g++ \ + linux-headers \ + make \ + && \ + pecl install %%XDEBUG_VERSION%% && \ + docker-php-ext-enable xdebug && \ + docker-php-source delete && \ + apk del .build-deps && \ + php -v && \ + php -m + +COPY docker-xdebug-* /usr/local/bin/ diff --git a/Makefile b/Makefile index b410f7b..fe38569 100644 --- a/Makefile +++ b/Makefile @@ -1,40 +1,48 @@ #!/usr/bin/make -f IMAGE := mileschou/xdebug -.PHONY: 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +.PHONY: 8.2 8.1 8.0 7.4 7.3 7.2 7.1 7.0 5.6 5.5 # ------------------------------------------------------------------------------ -all: 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +all: 8.2 8.1 8.0 7.4 7.3 7.2 7.1 7.0 5.6 5.5 -5.5: - docker build -t=$(IMAGE):5.5 -f 5.5/Dockerfile . - docker build -t=$(IMAGE):5.5-apache -f 5.5/apache/Dockerfile . +8.2: + docker build -t=$(IMAGE):8.2 -f 8.2/Dockerfile . + docker build -t=$(IMAGE):8.2-apache -f 8.2/apache/Dockerfile . -5.6: - docker build -t=$(IMAGE):5.6 -f 5.6/Dockerfile . - docker build -t=$(IMAGE):5.6-apache -f 5.6/apache/Dockerfile . +8.1: + docker build -t=$(IMAGE):8.1 -f 8.1/Dockerfile . + docker build -t=$(IMAGE):8.1-apache -f 8.1/apache/Dockerfile . -7.0: - docker build -t=$(IMAGE):7.0 -f 7.0/Dockerfile . - docker build -t=$(IMAGE):7.0-apache -f 7.0/apache/Dockerfile . +8.0: + docker build -t=$(IMAGE):8.0 -f 8.0/Dockerfile . + docker build -t=$(IMAGE):8.0-apache -f 8.0/apache/Dockerfile . -7.1: - docker build -t=$(IMAGE):7.1 -f 7.1/Dockerfile . - docker build -t=$(IMAGE):7.1-apache -f 7.1/apache/Dockerfile . +7.4: + docker build -t=$(IMAGE):7.4 -f 7.4/Dockerfile . + docker build -t=$(IMAGE):7.4-apache -f 7.4/apache/Dockerfile . + +7.3: + docker build -t=$(IMAGE):7.3 -f 7.3/Dockerfile . + docker build -t=$(IMAGE):7.3-apache -f 7.3/apache/Dockerfile . 7.2: docker build -t=$(IMAGE):7.2 -f 7.2/Dockerfile . docker build -t=$(IMAGE):7.2-apache -f 7.2/apache/Dockerfile . -7.3: - docker build -t=$(IMAGE):7.3 -f 7.3/Dockerfile . - docker build -t=$(IMAGE):7.3-apache -f 7.3/apache/Dockerfile . +7.1: + docker build -t=$(IMAGE):7.1 -f 7.1/Dockerfile . + docker build -t=$(IMAGE):7.1-apache -f 7.1/apache/Dockerfile . -7.4: - docker build -t=$(IMAGE):7.4 -f 7.4/Dockerfile . - docker build -t=$(IMAGE):7.4-apache -f 7.4/apache/Dockerfile . +7.0: + docker build -t=$(IMAGE):7.0 -f 7.0/Dockerfile . + docker build -t=$(IMAGE):7.0-apache -f 7.0/apache/Dockerfile . -8.0: - docker build -t=$(IMAGE):8.0 -f 8.0/Dockerfile . - docker build -t=$(IMAGE):8.0-apache -f 8.0/apache/Dockerfile . +5.6: + docker build -t=$(IMAGE):5.6 -f 5.6/Dockerfile . + docker build -t=$(IMAGE):5.6-apache -f 5.6/apache/Dockerfile . + +5.5: + docker build -t=$(IMAGE):5.5 -f 5.5/Dockerfile . + docker build -t=$(IMAGE):5.5-apache -f 5.5/apache/Dockerfile . \ No newline at end of file diff --git a/README.md b/README.md index 537957c..345d2f6 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,9 @@ See [GitHub Marketplace](https://github.com/marketplace/actions/xdebug-action) f ### PHP CLI -* [`latest`, `8.0`, `cli`, `8.0-cli` (8.0/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/8.0/Dockerfile) +* [`latest`, `8.2`, `cli`, `8.2-cli` (8.2/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/8.2/Dockerfile) +* [`8.1`, `8.1-cli` (8.1/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/8.1/Dockerfile) +* [`8.0`, `8.0-cli` (8.0/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/8.0/Dockerfile) * [`7.4`, `7.4-cli` (7.4/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/7.4/Dockerfile) * [`7.3`, `7.3-cli` (7.3/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/7.3/Dockerfile) * [`7.2`, `7.2-cli` (7.2/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/7.2/Dockerfile) @@ -36,7 +38,9 @@ See [GitHub Marketplace](https://github.com/marketplace/actions/xdebug-action) f ### Alpine -* [`alpine`, `8.0-alpine` (8.0/alpine/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/8.0/alpine/Dockerfile) +* [`alpine`, `8.2-alpine` (8.2/alpine/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/8.2/alpine/Dockerfile) +* [`8.1-alpine` (8.1/alpine/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/8.1/alpine/Dockerfile) +* [`8.0-alpine` (8.0/alpine/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/8.0/alpine/Dockerfile) * [`7.4-alpine` (7.4/alpine/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/7.4/alpine/Dockerfile) * [`7.3-alpine` (7.3/alpine/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/7.3/alpine/Dockerfile) * [`7.2-alpine` (7.2/alpine/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/7.2/alpine/Dockerfile) @@ -47,7 +51,9 @@ See [GitHub Marketplace](https://github.com/marketplace/actions/xdebug-action) f ### Apache -* [`apache`, `8.0-apache` (8.0/apache/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/8.0/apache/Dockerfile) +* [`apache`, `8.2-apache` (8.2/apache/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/8.2/apache/Dockerfile) +* [`8.1-apache` (8.1/apache/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/8.1/apache/Dockerfile) +* [`8.0-apache` (8.0/apache/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/8.0/apache/Dockerfile) * [`7.4-apache` (7.4/apache/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/7.4/apache/Dockerfile) * [`7.3-apache` (7.3/apache/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/7.3/apache/Dockerfile) * [`7.2-apache` (7.2/apache/Dockerfile)](https://github.com/MilesChou/docker-xdebug/blob/master/7.2/apache/Dockerfile) diff --git a/update.sh b/update.sh index 85d8a14..36c7db6 100755 --- a/update.sh +++ b/update.sh @@ -20,10 +20,11 @@ VERSIONS=" 7.4 8.0 8.1 +8.2 " for version in ${VERSIONS}; do - main_version=$(echo ${version} | cut -f1 -d.) + main_version=$(echo "${version}" | cut -f1 -d.) if [[ "$main_version" == "5" ]]; then xdebug_version=xdebug-2.5.5 @@ -31,30 +32,43 @@ for version in ${VERSIONS}; do xdebug_version=xdebug-2.9.0 elif [[ "$version" == "7.1" ]]; then xdebug_version=xdebug-2.9.8 + elif [[ "$version" == "7.2" ]]; then + xdebug_version=xdebug-3.1.6 + elif [[ "$version" == "7.3" ]]; then + xdebug_version=xdebug-3.1.6 + elif [[ "$version" == "7.4" ]]; then + xdebug_version=xdebug-3.1.6 else xdebug_version=xdebug fi - rm -rf ${version} - mkdir -p ${version} - mkdir -p ${version}/alpine - mkdir -p ${version}/apache + if [[ "$main_version" == "8" ]]; then + alpine_file=Dockerfile-alpine-8.template + else + alpine_file=Dockerfile-alpine.template + fi - generated_warning > ${version}/Dockerfile + rm -rf "${version}" + mkdir -p "${version}" + mkdir -p "${version}"/alpine + mkdir -p "${version}"/apache + + generated_warning > "${version}"/Dockerfile cat Dockerfile-cli.template | \ sed -e 's!%%PHP_VERSION%%!'"${version}"'!' | \ sed -e 's!%%XDEBUG_VERSION%%!'"${xdebug_version}"'!' \ - >> ${version}/Dockerfile + >> "${version}"/Dockerfile + - generated_warning > ${version}/alpine/Dockerfile - cat Dockerfile-alpine.template | \ + generated_warning > "${version}"/alpine/Dockerfile + cat ${alpine_file} | \ sed -e 's!%%PHP_VERSION%%!'"${version}-alpine"'!' | \ sed -e 's!%%XDEBUG_VERSION%%!'"${xdebug_version}"'!' \ - >> ${version}/alpine/Dockerfile + >> "${version}"/alpine/Dockerfile - generated_warning > ${version}/apache/Dockerfile + generated_warning > "${version}"/apache/Dockerfile cat Dockerfile-apache.template | \ sed -e 's!%%PHP_VERSION%%!'"${version}-apache"'!' | \ sed -e 's!%%XDEBUG_VERSION%%!'"${xdebug_version}"'!' \ - >> ${version}/apache/Dockerfile + >> "${version}"/apache/Dockerfile done