From 37b3eaa3edff2a1bbe69bd843467ca221bd9772f Mon Sep 17 00:00:00 2001 From: MilesChou Date: Thu, 13 Apr 2023 13:50:07 +0800 Subject: [PATCH 1/5] Bump up to v5.2.1 --- .github/workflows/github_container_registry.yml | 8 ++++---- .github/workflows/test_dockerfiles.yml | 1 - 7.4/Dockerfile | 4 ++-- 8.0/Dockerfile | 4 ++-- 8.1/Dockerfile | 4 ++-- 8.2/Dockerfile | 2 +- Makefile | 8 +++++--- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/github_container_registry.yml b/.github/workflows/github_container_registry.yml index e82e22f..8a746ae 100644 --- a/.github/workflows/github_container_registry.yml +++ b/.github/workflows/github_container_registry.yml @@ -6,18 +6,18 @@ on: phalcon_version: description: 'Framework version' required: true - default: '5.1.4' + default: '5.2.1' jobs: cli: runs-on: ubuntu-latest strategy: matrix: - version: [ '7.4', '8.0', '8.1' ] + version: [ '7.4', '8.0', '8.1', '8.2' ] steps: - - uses: actions/checkout@master + - uses: actions/checkout@v3 - name: Build PHP ${{ matrix.version }} CLI version and publish - uses: elgohr/Publish-Docker-Github-Action@v4 + uses: elgohr/Publish-Docker-Github-Action@v5 env: PHALCON_VERSION: ${{ github.event.inputs.phalcon_version }} with: diff --git a/.github/workflows/test_dockerfiles.yml b/.github/workflows/test_dockerfiles.yml index ae6da7a..cac6311 100644 --- a/.github/workflows/test_dockerfiles.yml +++ b/.github/workflows/test_dockerfiles.yml @@ -12,6 +12,5 @@ jobs: version: [ '7.4', '8.0', '8.1', '8.2' ] steps: - uses: actions/checkout@v3 - - name: Build with PHP ${{ matrix.version }} run: docker build --progress=plain --file ${{ matrix.version }}/Dockerfile . diff --git a/7.4/Dockerfile b/7.4/Dockerfile index 3281f46..04201d0 100644 --- a/7.4/Dockerfile +++ b/7.4/Dockerfile @@ -1,7 +1,7 @@ -FROM php:7.4 +FROM php:7.4-cli ARG PSR_VERSION=1.1.0 -ARG PHALCON_VERSION=5.0.4 +ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ # Download PSR, see https://github.com/jbboehr/php-psr diff --git a/8.0/Dockerfile b/8.0/Dockerfile index e73ed20..c99be76 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -1,6 +1,6 @@ -FROM php:8.0 +FROM php:8.0-cli -ARG PHALCON_VERSION=5.0.4 +ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ docker-php-source extract && \ diff --git a/8.1/Dockerfile b/8.1/Dockerfile index 9ce526a..71fad03 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -1,6 +1,6 @@ -FROM php:8.1 +FROM php:8.1-cli -ARG PHALCON_VERSION=5.0.4 +ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ docker-php-source extract && \ diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 7248588..adbf6d7 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2 +FROM php:8.2-cli ARG PHALCON_VERSION=5.2.1 diff --git a/Makefile b/Makefile index 8f88053..8c91f66 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,15 @@ #!/usr/bin/make -f IMAGE := phalcon/docker -.PHONY: variants - -# --------------------------------------------------------------------------- +.PHONY: build +build: + docker build --progress plain --tag phalcon:8.2-cli --file 8.2/Dockerfile . +.PHONY: variants variants: php @find php -name "Dockerfile" | sed 's/php\/\(.*\)\/Dockerfile/\1/' rm -rf php +.PHONY: php php: git clone -q --depth 1 git@github.com:docker-library/php.git php From 0c855ec448e7976f9a0f5e07d7238170a597df45 Mon Sep 17 00:00:00 2001 From: MilesChou Date: Thu, 13 Apr 2023 14:01:49 +0800 Subject: [PATCH 2/5] Split GitHub workflows --- .github/workflows/build_images.yml | 15 +++++++++++++++ .github/workflows/github_container_registry.yml | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/build_images.yml diff --git a/.github/workflows/build_images.yml b/.github/workflows/build_images.yml new file mode 100644 index 0000000..25008d7 --- /dev/null +++ b/.github/workflows/build_images.yml @@ -0,0 +1,15 @@ +name: Build Images + +on: + workflow_dispatch: + inputs: + phalcon_version: + description: 'Framework version' + required: true + default: '5.2.1' + +jobs: + push_github_container_register: + uses: ./.github/workflows/github_container_registry.yml + with: + phalcon_version: ${{ github.event.inputs.phalcon_version }} \ No newline at end of file diff --git a/.github/workflows/github_container_registry.yml b/.github/workflows/github_container_registry.yml index 8a746ae..01abce1 100644 --- a/.github/workflows/github_container_registry.yml +++ b/.github/workflows/github_container_registry.yml @@ -1,12 +1,12 @@ name: Publish GitHub Container Registry on: - workflow_dispatch: + workflow_call: inputs: phalcon_version: description: 'Framework version' required: true - default: '5.2.1' + type: string jobs: cli: @@ -19,7 +19,7 @@ jobs: - name: Build PHP ${{ matrix.version }} CLI version and publish uses: elgohr/Publish-Docker-Github-Action@v5 env: - PHALCON_VERSION: ${{ github.event.inputs.phalcon_version }} + PHALCON_VERSION: ${{ inputs.phalcon_version }} with: name: phalcon/docker tags: ${{ matrix.version }},${{ matrix.version }}-cli From f0978893f3be63b99d19e23e63782bb3032c7772 Mon Sep 17 00:00:00 2001 From: MilesChou Date: Thu, 13 Apr 2023 14:20:11 +0800 Subject: [PATCH 3/5] Add PHP 8.2 variants --- .github/workflows/test_dockerfile.yml | 17 +++++++++++++++++ 8.2/Dockerfile | 2 +- 8.2/alpine3.16/cli/Dockerfile | 21 +++++++++++++++++++++ 8.2/alpine3.16/fpm/Dockerfile | 21 +++++++++++++++++++++ 8.2/alpine3.16/zts/Dockerfile | 21 +++++++++++++++++++++ 8.2/alpine3.17/cli/Dockerfile | 21 +++++++++++++++++++++ 8.2/alpine3.17/fpm/Dockerfile | 21 +++++++++++++++++++++ 8.2/alpine3.17/zts/Dockerfile | 21 +++++++++++++++++++++ 8.2/bullseye/apache/Dockerfile | 21 +++++++++++++++++++++ 8.2/bullseye/cli/Dockerfile | 21 +++++++++++++++++++++ 8.2/bullseye/fpm/Dockerfile | 21 +++++++++++++++++++++ 8.2/bullseye/zts/Dockerfile | 21 +++++++++++++++++++++ 8.2/buster/apache/Dockerfile | 21 +++++++++++++++++++++ 8.2/buster/cli/Dockerfile | 21 +++++++++++++++++++++ 8.2/buster/fpm/Dockerfile | 21 +++++++++++++++++++++ 8.2/buster/zts/Dockerfile | 21 +++++++++++++++++++++ Makefile | 2 +- 17 files changed, 313 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/test_dockerfile.yml create mode 100644 8.2/alpine3.16/cli/Dockerfile create mode 100644 8.2/alpine3.16/fpm/Dockerfile create mode 100644 8.2/alpine3.16/zts/Dockerfile create mode 100644 8.2/alpine3.17/cli/Dockerfile create mode 100644 8.2/alpine3.17/fpm/Dockerfile create mode 100644 8.2/alpine3.17/zts/Dockerfile create mode 100644 8.2/bullseye/apache/Dockerfile create mode 100644 8.2/bullseye/cli/Dockerfile create mode 100644 8.2/bullseye/fpm/Dockerfile create mode 100644 8.2/bullseye/zts/Dockerfile create mode 100644 8.2/buster/apache/Dockerfile create mode 100644 8.2/buster/cli/Dockerfile create mode 100644 8.2/buster/fpm/Dockerfile create mode 100644 8.2/buster/zts/Dockerfile diff --git a/.github/workflows/test_dockerfile.yml b/.github/workflows/test_dockerfile.yml new file mode 100644 index 0000000..d67a9d4 --- /dev/null +++ b/.github/workflows/test_dockerfile.yml @@ -0,0 +1,17 @@ +name: Test Dockerfile + +on: + workflow_dispatch: + inputs: + path: + description: 'Path of Dockerfile' + required: true + default: '8.2' + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Build with PHP variant ${{ github.event.input.path }} + run: docker build --progress=plain --file ${{ github.event.input.path }}/Dockerfile . diff --git a/8.2/Dockerfile b/8.2/Dockerfile index adbf6d7..287d0ba 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2-cli +FROM php:8.2-cli-bullseye ARG PHALCON_VERSION=5.2.1 diff --git a/8.2/alpine3.16/cli/Dockerfile b/8.2/alpine3.16/cli/Dockerfile new file mode 100644 index 0000000..8a4c319 --- /dev/null +++ b/8.2/alpine3.16/cli/Dockerfile @@ -0,0 +1,21 @@ +FROM php:8.2-cli-alpine3.16 + +ARG PHALCON_VERSION=5.2.1 + +RUN set -xe && \ + docker-php-source extract && \ + # Install ext-phalcon + curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + tar xzf /v${PHALCON_VERSION}.tar.gz && \ + docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ + /cphalcon-${PHALCON_VERSION}/build/phalcon \ + && \ + # Remove all temp files + rm -r \ + /v${PHALCON_VERSION}.tar.gz \ + /cphalcon-${PHALCON_VERSION} \ + && \ + docker-php-source delete && \ + php -m + +COPY docker-phalcon-* /usr/local/bin/ diff --git a/8.2/alpine3.16/fpm/Dockerfile b/8.2/alpine3.16/fpm/Dockerfile new file mode 100644 index 0000000..573e3fe --- /dev/null +++ b/8.2/alpine3.16/fpm/Dockerfile @@ -0,0 +1,21 @@ +FROM php:8.2-fpm-alpine3.16 + +ARG PHALCON_VERSION=5.2.1 + +RUN set -xe && \ + docker-php-source extract && \ + # Install ext-phalcon + curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + tar xzf /v${PHALCON_VERSION}.tar.gz && \ + docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ + /cphalcon-${PHALCON_VERSION}/build/phalcon \ + && \ + # Remove all temp files + rm -r \ + /v${PHALCON_VERSION}.tar.gz \ + /cphalcon-${PHALCON_VERSION} \ + && \ + docker-php-source delete && \ + php -m + +COPY docker-phalcon-* /usr/local/bin/ diff --git a/8.2/alpine3.16/zts/Dockerfile b/8.2/alpine3.16/zts/Dockerfile new file mode 100644 index 0000000..400af38 --- /dev/null +++ b/8.2/alpine3.16/zts/Dockerfile @@ -0,0 +1,21 @@ +FROM php:8.2-zts-alpine3.16 + +ARG PHALCON_VERSION=5.2.1 + +RUN set -xe && \ + docker-php-source extract && \ + # Install ext-phalcon + curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + tar xzf /v${PHALCON_VERSION}.tar.gz && \ + docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ + /cphalcon-${PHALCON_VERSION}/build/phalcon \ + && \ + # Remove all temp files + rm -r \ + /v${PHALCON_VERSION}.tar.gz \ + /cphalcon-${PHALCON_VERSION} \ + && \ + docker-php-source delete && \ + php -m + +COPY docker-phalcon-* /usr/local/bin/ diff --git a/8.2/alpine3.17/cli/Dockerfile b/8.2/alpine3.17/cli/Dockerfile new file mode 100644 index 0000000..0532842 --- /dev/null +++ b/8.2/alpine3.17/cli/Dockerfile @@ -0,0 +1,21 @@ +FROM php:8.2-cli-alpine3.17 + +ARG PHALCON_VERSION=5.2.1 + +RUN set -xe && \ + docker-php-source extract && \ + # Install ext-phalcon + curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + tar xzf /v${PHALCON_VERSION}.tar.gz && \ + docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ + /cphalcon-${PHALCON_VERSION}/build/phalcon \ + && \ + # Remove all temp files + rm -r \ + /v${PHALCON_VERSION}.tar.gz \ + /cphalcon-${PHALCON_VERSION} \ + && \ + docker-php-source delete && \ + php -m + +COPY docker-phalcon-* /usr/local/bin/ diff --git a/8.2/alpine3.17/fpm/Dockerfile b/8.2/alpine3.17/fpm/Dockerfile new file mode 100644 index 0000000..82a1b39 --- /dev/null +++ b/8.2/alpine3.17/fpm/Dockerfile @@ -0,0 +1,21 @@ +FROM php:8.2-fpm-alpine3.17 + +ARG PHALCON_VERSION=5.2.1 + +RUN set -xe && \ + docker-php-source extract && \ + # Install ext-phalcon + curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + tar xzf /v${PHALCON_VERSION}.tar.gz && \ + docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ + /cphalcon-${PHALCON_VERSION}/build/phalcon \ + && \ + # Remove all temp files + rm -r \ + /v${PHALCON_VERSION}.tar.gz \ + /cphalcon-${PHALCON_VERSION} \ + && \ + docker-php-source delete && \ + php -m + +COPY docker-phalcon-* /usr/local/bin/ diff --git a/8.2/alpine3.17/zts/Dockerfile b/8.2/alpine3.17/zts/Dockerfile new file mode 100644 index 0000000..0b7aaa0 --- /dev/null +++ b/8.2/alpine3.17/zts/Dockerfile @@ -0,0 +1,21 @@ +FROM php:8.2-zts-alpine3.17 + +ARG PHALCON_VERSION=5.2.1 + +RUN set -xe && \ + docker-php-source extract && \ + # Install ext-phalcon + curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + tar xzf /v${PHALCON_VERSION}.tar.gz && \ + docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ + /cphalcon-${PHALCON_VERSION}/build/phalcon \ + && \ + # Remove all temp files + rm -r \ + /v${PHALCON_VERSION}.tar.gz \ + /cphalcon-${PHALCON_VERSION} \ + && \ + docker-php-source delete && \ + php -m + +COPY docker-phalcon-* /usr/local/bin/ diff --git a/8.2/bullseye/apache/Dockerfile b/8.2/bullseye/apache/Dockerfile new file mode 100644 index 0000000..fd012ff --- /dev/null +++ b/8.2/bullseye/apache/Dockerfile @@ -0,0 +1,21 @@ +FROM php:8.2-apache-bullseye + +ARG PHALCON_VERSION=5.2.1 + +RUN set -xe && \ + docker-php-source extract && \ + # Install ext-phalcon + curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + tar xzf /v${PHALCON_VERSION}.tar.gz && \ + docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ + /cphalcon-${PHALCON_VERSION}/build/phalcon \ + && \ + # Remove all temp files + rm -r \ + /v${PHALCON_VERSION}.tar.gz \ + /cphalcon-${PHALCON_VERSION} \ + && \ + docker-php-source delete && \ + php -m + +COPY docker-phalcon-* /usr/local/bin/ diff --git a/8.2/bullseye/cli/Dockerfile b/8.2/bullseye/cli/Dockerfile new file mode 100644 index 0000000..66c4b9c --- /dev/null +++ b/8.2/bullseye/cli/Dockerfile @@ -0,0 +1,21 @@ +FROM php:8.2-cli-bullseye + +ARG PHALCON_VERSION=5.2.1 + +RUN set -xe && \ + docker-php-source extract && \ + # Install ext-phalcon + curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + tar xzf /v${PHALCON_VERSION}.tar.gz && \ + docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ + /cphalcon-${PHALCON_VERSION}/build/phalcon \ + && \ + # Remove all temp files + rm -r \ + /v${PHALCON_VERSION}.tar.gz \ + /cphalcon-${PHALCON_VERSION} \ + && \ + docker-php-source delete && \ + php -m + +COPY docker-phalcon-* /usr/local/bin/ diff --git a/8.2/bullseye/fpm/Dockerfile b/8.2/bullseye/fpm/Dockerfile new file mode 100644 index 0000000..58b768a --- /dev/null +++ b/8.2/bullseye/fpm/Dockerfile @@ -0,0 +1,21 @@ +FROM php:8.2-fpm-bullseye + +ARG PHALCON_VERSION=5.2.1 + +RUN set -xe && \ + docker-php-source extract && \ + # Install ext-phalcon + curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + tar xzf /v${PHALCON_VERSION}.tar.gz && \ + docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ + /cphalcon-${PHALCON_VERSION}/build/phalcon \ + && \ + # Remove all temp files + rm -r \ + /v${PHALCON_VERSION}.tar.gz \ + /cphalcon-${PHALCON_VERSION} \ + && \ + docker-php-source delete && \ + php -m + +COPY docker-phalcon-* /usr/local/bin/ diff --git a/8.2/bullseye/zts/Dockerfile b/8.2/bullseye/zts/Dockerfile new file mode 100644 index 0000000..9baa253 --- /dev/null +++ b/8.2/bullseye/zts/Dockerfile @@ -0,0 +1,21 @@ +FROM php:8.2-zts-bullseye + +ARG PHALCON_VERSION=5.2.1 + +RUN set -xe && \ + docker-php-source extract && \ + # Install ext-phalcon + curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + tar xzf /v${PHALCON_VERSION}.tar.gz && \ + docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ + /cphalcon-${PHALCON_VERSION}/build/phalcon \ + && \ + # Remove all temp files + rm -r \ + /v${PHALCON_VERSION}.tar.gz \ + /cphalcon-${PHALCON_VERSION} \ + && \ + docker-php-source delete && \ + php -m + +COPY docker-phalcon-* /usr/local/bin/ diff --git a/8.2/buster/apache/Dockerfile b/8.2/buster/apache/Dockerfile new file mode 100644 index 0000000..9d56e53 --- /dev/null +++ b/8.2/buster/apache/Dockerfile @@ -0,0 +1,21 @@ +FROM php:8.2-apache-buster + +ARG PHALCON_VERSION=5.2.1 + +RUN set -xe && \ + docker-php-source extract && \ + # Install ext-phalcon + curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + tar xzf /v${PHALCON_VERSION}.tar.gz && \ + docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ + /cphalcon-${PHALCON_VERSION}/build/phalcon \ + && \ + # Remove all temp files + rm -r \ + /v${PHALCON_VERSION}.tar.gz \ + /cphalcon-${PHALCON_VERSION} \ + && \ + docker-php-source delete && \ + php -m + +COPY docker-phalcon-* /usr/local/bin/ diff --git a/8.2/buster/cli/Dockerfile b/8.2/buster/cli/Dockerfile new file mode 100644 index 0000000..34a0882 --- /dev/null +++ b/8.2/buster/cli/Dockerfile @@ -0,0 +1,21 @@ +FROM php:8.2-cli-buster + +ARG PHALCON_VERSION=5.2.1 + +RUN set -xe && \ + docker-php-source extract && \ + # Install ext-phalcon + curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + tar xzf /v${PHALCON_VERSION}.tar.gz && \ + docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ + /cphalcon-${PHALCON_VERSION}/build/phalcon \ + && \ + # Remove all temp files + rm -r \ + /v${PHALCON_VERSION}.tar.gz \ + /cphalcon-${PHALCON_VERSION} \ + && \ + docker-php-source delete && \ + php -m + +COPY docker-phalcon-* /usr/local/bin/ diff --git a/8.2/buster/fpm/Dockerfile b/8.2/buster/fpm/Dockerfile new file mode 100644 index 0000000..a811f3a --- /dev/null +++ b/8.2/buster/fpm/Dockerfile @@ -0,0 +1,21 @@ +FROM php:8.2-fpm-buster + +ARG PHALCON_VERSION=5.2.1 + +RUN set -xe && \ + docker-php-source extract && \ + # Install ext-phalcon + curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + tar xzf /v${PHALCON_VERSION}.tar.gz && \ + docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ + /cphalcon-${PHALCON_VERSION}/build/phalcon \ + && \ + # Remove all temp files + rm -r \ + /v${PHALCON_VERSION}.tar.gz \ + /cphalcon-${PHALCON_VERSION} \ + && \ + docker-php-source delete && \ + php -m + +COPY docker-phalcon-* /usr/local/bin/ diff --git a/8.2/buster/zts/Dockerfile b/8.2/buster/zts/Dockerfile new file mode 100644 index 0000000..c07ceb8 --- /dev/null +++ b/8.2/buster/zts/Dockerfile @@ -0,0 +1,21 @@ +FROM php:8.2-zts-buster + +ARG PHALCON_VERSION=5.2.1 + +RUN set -xe && \ + docker-php-source extract && \ + # Install ext-phalcon + curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + tar xzf /v${PHALCON_VERSION}.tar.gz && \ + docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ + /cphalcon-${PHALCON_VERSION}/build/phalcon \ + && \ + # Remove all temp files + rm -r \ + /v${PHALCON_VERSION}.tar.gz \ + /cphalcon-${PHALCON_VERSION} \ + && \ + docker-php-source delete && \ + php -m + +COPY docker-phalcon-* /usr/local/bin/ diff --git a/Makefile b/Makefile index 8c91f66..c2067fa 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ IMAGE := phalcon/docker .PHONY: build build: - docker build --progress plain --tag phalcon:8.2-cli --file 8.2/Dockerfile . + docker build --progress plain --tag phalcon:8.2-cli-alpine3.17 --file 8.2/alpine3.17/cli/Dockerfile . .PHONY: variants variants: php From a7e1d315095dd117cd13292a8e93f950d41600ff Mon Sep 17 00:00:00 2001 From: MilesChou Date: Thu, 13 Apr 2023 14:22:24 +0800 Subject: [PATCH 4/5] Fix typo --- .github/workflows/test_dockerfile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_dockerfile.yml b/.github/workflows/test_dockerfile.yml index d67a9d4..67fbfd2 100644 --- a/.github/workflows/test_dockerfile.yml +++ b/.github/workflows/test_dockerfile.yml @@ -14,4 +14,4 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build with PHP variant ${{ github.event.input.path }} - run: docker build --progress=plain --file ${{ github.event.input.path }}/Dockerfile . + run: docker build --progress=plain --file ${{ github.event.inputs.path }}/Dockerfile . From 32575b8ef5c51edcd098c86f20e17c62dfbc2224 Mon Sep 17 00:00:00 2001 From: MilesChou Date: Thu, 13 Apr 2023 14:38:55 +0800 Subject: [PATCH 5/5] Fix dockerfile command path --- .github/workflows/test_dockerfile.yml | 2 +- 7.4/Dockerfile | 5 +++-- 8.0/Dockerfile | 3 ++- 8.1/Dockerfile | 3 ++- 8.2/Dockerfile | 3 ++- 8.2/alpine3.16/cli/Dockerfile | 3 ++- 8.2/alpine3.16/fpm/Dockerfile | 3 ++- 8.2/alpine3.16/zts/Dockerfile | 3 ++- 8.2/alpine3.17/cli/Dockerfile | 3 ++- 8.2/alpine3.17/fpm/Dockerfile | 3 ++- 8.2/alpine3.17/zts/Dockerfile | 3 ++- 8.2/bullseye/apache/Dockerfile | 1 + 8.2/bullseye/cli/Dockerfile | 1 + 8.2/bullseye/fpm/Dockerfile | 1 + 8.2/bullseye/zts/Dockerfile | 1 + 8.2/buster/apache/Dockerfile | 1 + 8.2/buster/cli/Dockerfile | 1 + 8.2/buster/fpm/Dockerfile | 1 + 8.2/buster/zts/Dockerfile | 1 + 19 files changed, 30 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test_dockerfile.yml b/.github/workflows/test_dockerfile.yml index 67fbfd2..62c641b 100644 --- a/.github/workflows/test_dockerfile.yml +++ b/.github/workflows/test_dockerfile.yml @@ -14,4 +14,4 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build with PHP variant ${{ github.event.input.path }} - run: docker build --progress=plain --file ${{ github.event.inputs.path }}/Dockerfile . + run: docker build --progress plain --file ${{ github.event.inputs.path }}/Dockerfile . diff --git a/7.4/Dockerfile b/7.4/Dockerfile index 04201d0..a510555 100644 --- a/7.4/Dockerfile +++ b/7.4/Dockerfile @@ -4,11 +4,12 @@ ARG PSR_VERSION=1.1.0 ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ + cd / && \ # Download PSR, see https://github.com/jbboehr/php-psr - curl -LO https://github.com/jbboehr/php-psr/archive/v${PSR_VERSION}.tar.gz && \ + curl -sSLO https://github.com/jbboehr/php-psr/archive/v${PSR_VERSION}.tar.gz && \ tar xzf /v${PSR_VERSION}.tar.gz && \ # Download Phalcon - curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ tar xzf /v${PHALCON_VERSION}.tar.gz && \ docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ /php-psr-${PSR_VERSION} \ diff --git a/8.0/Dockerfile b/8.0/Dockerfile index c99be76..9f2c0ab 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -3,9 +3,10 @@ FROM php:8.0-cli ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ + cd / && \ docker-php-source extract && \ # Install ext-phalcon - curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ tar xzf /v${PHALCON_VERSION}.tar.gz && \ docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ /cphalcon-${PHALCON_VERSION}/build/phalcon \ diff --git a/8.1/Dockerfile b/8.1/Dockerfile index 71fad03..0444169 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -3,9 +3,10 @@ FROM php:8.1-cli ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ + cd / && \ docker-php-source extract && \ # Install ext-phalcon - curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ tar xzf /v${PHALCON_VERSION}.tar.gz && \ docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ /cphalcon-${PHALCON_VERSION}/build/phalcon \ diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 287d0ba..23396fa 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -3,9 +3,10 @@ FROM php:8.2-cli-bullseye ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ + cd / && \ docker-php-source extract && \ # Install ext-phalcon - curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ tar xzf /v${PHALCON_VERSION}.tar.gz && \ docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ /cphalcon-${PHALCON_VERSION}/build/phalcon \ diff --git a/8.2/alpine3.16/cli/Dockerfile b/8.2/alpine3.16/cli/Dockerfile index 8a4c319..8c418b4 100644 --- a/8.2/alpine3.16/cli/Dockerfile +++ b/8.2/alpine3.16/cli/Dockerfile @@ -3,9 +3,10 @@ FROM php:8.2-cli-alpine3.16 ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ + cd / && \ docker-php-source extract && \ # Install ext-phalcon - curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ tar xzf /v${PHALCON_VERSION}.tar.gz && \ docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ /cphalcon-${PHALCON_VERSION}/build/phalcon \ diff --git a/8.2/alpine3.16/fpm/Dockerfile b/8.2/alpine3.16/fpm/Dockerfile index 573e3fe..1e06f63 100644 --- a/8.2/alpine3.16/fpm/Dockerfile +++ b/8.2/alpine3.16/fpm/Dockerfile @@ -3,9 +3,10 @@ FROM php:8.2-fpm-alpine3.16 ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ + cd / && \ docker-php-source extract && \ # Install ext-phalcon - curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ tar xzf /v${PHALCON_VERSION}.tar.gz && \ docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ /cphalcon-${PHALCON_VERSION}/build/phalcon \ diff --git a/8.2/alpine3.16/zts/Dockerfile b/8.2/alpine3.16/zts/Dockerfile index 400af38..9299771 100644 --- a/8.2/alpine3.16/zts/Dockerfile +++ b/8.2/alpine3.16/zts/Dockerfile @@ -3,9 +3,10 @@ FROM php:8.2-zts-alpine3.16 ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ + cd / && \ docker-php-source extract && \ # Install ext-phalcon - curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ tar xzf /v${PHALCON_VERSION}.tar.gz && \ docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ /cphalcon-${PHALCON_VERSION}/build/phalcon \ diff --git a/8.2/alpine3.17/cli/Dockerfile b/8.2/alpine3.17/cli/Dockerfile index 0532842..144f840 100644 --- a/8.2/alpine3.17/cli/Dockerfile +++ b/8.2/alpine3.17/cli/Dockerfile @@ -3,9 +3,10 @@ FROM php:8.2-cli-alpine3.17 ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ + cd / && \ docker-php-source extract && \ # Install ext-phalcon - curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ tar xzf /v${PHALCON_VERSION}.tar.gz && \ docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ /cphalcon-${PHALCON_VERSION}/build/phalcon \ diff --git a/8.2/alpine3.17/fpm/Dockerfile b/8.2/alpine3.17/fpm/Dockerfile index 82a1b39..52c116c 100644 --- a/8.2/alpine3.17/fpm/Dockerfile +++ b/8.2/alpine3.17/fpm/Dockerfile @@ -3,9 +3,10 @@ FROM php:8.2-fpm-alpine3.17 ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ + cd / && \ docker-php-source extract && \ # Install ext-phalcon - curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ tar xzf /v${PHALCON_VERSION}.tar.gz && \ docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ /cphalcon-${PHALCON_VERSION}/build/phalcon \ diff --git a/8.2/alpine3.17/zts/Dockerfile b/8.2/alpine3.17/zts/Dockerfile index 0b7aaa0..560e772 100644 --- a/8.2/alpine3.17/zts/Dockerfile +++ b/8.2/alpine3.17/zts/Dockerfile @@ -3,9 +3,10 @@ FROM php:8.2-zts-alpine3.17 ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ + cd / && \ docker-php-source extract && \ # Install ext-phalcon - curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ + curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ tar xzf /v${PHALCON_VERSION}.tar.gz && \ docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \ /cphalcon-${PHALCON_VERSION}/build/phalcon \ diff --git a/8.2/bullseye/apache/Dockerfile b/8.2/bullseye/apache/Dockerfile index fd012ff..e49c15c 100644 --- a/8.2/bullseye/apache/Dockerfile +++ b/8.2/bullseye/apache/Dockerfile @@ -3,6 +3,7 @@ FROM php:8.2-apache-bullseye ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ + cd / && \ docker-php-source extract && \ # Install ext-phalcon curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ diff --git a/8.2/bullseye/cli/Dockerfile b/8.2/bullseye/cli/Dockerfile index 66c4b9c..23396fa 100644 --- a/8.2/bullseye/cli/Dockerfile +++ b/8.2/bullseye/cli/Dockerfile @@ -3,6 +3,7 @@ FROM php:8.2-cli-bullseye ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ + cd / && \ docker-php-source extract && \ # Install ext-phalcon curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ diff --git a/8.2/bullseye/fpm/Dockerfile b/8.2/bullseye/fpm/Dockerfile index 58b768a..3200c9e 100644 --- a/8.2/bullseye/fpm/Dockerfile +++ b/8.2/bullseye/fpm/Dockerfile @@ -3,6 +3,7 @@ FROM php:8.2-fpm-bullseye ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ + cd / && \ docker-php-source extract && \ # Install ext-phalcon curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ diff --git a/8.2/bullseye/zts/Dockerfile b/8.2/bullseye/zts/Dockerfile index 9baa253..1d2ff7e 100644 --- a/8.2/bullseye/zts/Dockerfile +++ b/8.2/bullseye/zts/Dockerfile @@ -3,6 +3,7 @@ FROM php:8.2-zts-bullseye ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ + cd / && \ docker-php-source extract && \ # Install ext-phalcon curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ diff --git a/8.2/buster/apache/Dockerfile b/8.2/buster/apache/Dockerfile index 9d56e53..a0346c9 100644 --- a/8.2/buster/apache/Dockerfile +++ b/8.2/buster/apache/Dockerfile @@ -3,6 +3,7 @@ FROM php:8.2-apache-buster ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ + cd / && \ docker-php-source extract && \ # Install ext-phalcon curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ diff --git a/8.2/buster/cli/Dockerfile b/8.2/buster/cli/Dockerfile index 34a0882..9b5bc64 100644 --- a/8.2/buster/cli/Dockerfile +++ b/8.2/buster/cli/Dockerfile @@ -3,6 +3,7 @@ FROM php:8.2-cli-buster ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ + cd / && \ docker-php-source extract && \ # Install ext-phalcon curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ diff --git a/8.2/buster/fpm/Dockerfile b/8.2/buster/fpm/Dockerfile index a811f3a..668ad73 100644 --- a/8.2/buster/fpm/Dockerfile +++ b/8.2/buster/fpm/Dockerfile @@ -3,6 +3,7 @@ FROM php:8.2-fpm-buster ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ + cd / && \ docker-php-source extract && \ # Install ext-phalcon curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \ diff --git a/8.2/buster/zts/Dockerfile b/8.2/buster/zts/Dockerfile index c07ceb8..508e40f 100644 --- a/8.2/buster/zts/Dockerfile +++ b/8.2/buster/zts/Dockerfile @@ -3,6 +3,7 @@ FROM php:8.2-zts-buster ARG PHALCON_VERSION=5.2.1 RUN set -xe && \ + cd / && \ docker-php-source extract && \ # Install ext-phalcon curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \