diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 40978aa..646976a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,9 +44,7 @@ jobs: file: "./src/docker/8.2/Dockerfile" push: true platforms: linux/amd64,linux/arm64 - tags: | - "${{env.BUILDKIT_IMAGE}}:8.2" - "${{env.BUILDKIT_IMAGE}}:latest" + tags: "${{env.BUILDKIT_IMAGE}}:8.2" - name: Build and push 8.1 alpine uses: docker/build-push-action@v3 @@ -66,11 +64,21 @@ jobs: tags: | "${{env.BUILDKIT_IMAGE}}:8.2-alpine" - - name: Build and push 8.3 0RC3 + name: Build and push 8.3 alpine + uses: docker/build-push-action@v3 + with: + file: "./src/docker/8.3/Dockerfile.alpine" + push: true + platforms: linux/amd64,linux/arm64 + tags: | + "${{env.BUILDKIT_IMAGE}}:8.3-alpine" + - + name: Build and push 8.3 uses: docker/build-push-action@v3 with: file: "./src/docker/8.3/Dockerfile" push: true platforms: linux/amd64,linux/arm64 tags: | - "${{env.BUILDKIT_IMAGE}}:8.3.0RC3" \ No newline at end of file + "${{env.BUILDKIT_IMAGE}}:8.3.0-fpm" + "${{env.BUILDKIT_IMAGE}}:latest" diff --git a/.github/workflows/manual.yaml b/.github/workflows/manual.yaml index 16290b1..2edd034 100644 --- a/.github/workflows/manual.yaml +++ b/.github/workflows/manual.yaml @@ -70,9 +70,7 @@ jobs: file: "./src/docker/8.2/Dockerfile" push: true platforms: linux/amd64,linux/arm64 - tags: | - "${{env.BUILDKIT_IMAGE}}:8.2" - "${{env.BUILDKIT_IMAGE}}:latest" + tags: "${{env.BUILDKIT_IMAGE}}:8.2" - name: Build and push 8.1 alpine uses: docker/build-push-action@v3 @@ -90,4 +88,25 @@ jobs: push: true platforms: linux/amd64,linux/arm64 tags: | - "${{env.BUILDKIT_IMAGE}}:8.2-alpine" \ No newline at end of file + "${{env.BUILDKIT_IMAGE}}:8.2-alpine" + - + name: Build and push 8.3 alpine + uses: docker/build-push-action@v3 + with: + file: "./src/docker/8.3/Dockerfile.alpine" + push: true + platforms: linux/amd64,linux/arm64 + tags: | + "${{env.BUILDKIT_IMAGE}}:8.3-alpine" + - + name: Build and push 8.3 + uses: docker/build-push-action@v3 + with: + file: "./src/docker/8.3/Dockerfile" + push: true + platforms: linux/amd64,linux/arm64 + tags: | + "${{env.BUILDKIT_IMAGE}}:8.3.0-fpm" + "${{env.BUILDKIT_IMAGE}}:latest" + + \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 51e8c54..5ada036 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: php-fpm: - image: jkaninda/laravel-php-fpm:latest + image: jkaninda/laravel-php-fpm:8.3 container_name: php-fpm restart: unless-stopped volumes: diff --git a/src/docker/8.2/Dockerfile b/src/docker/8.2/Dockerfile index 6d3d653..4713f16 100644 --- a/src/docker/8.2/Dockerfile +++ b/src/docker/8.2/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.12-fpm +FROM php:8.2-fpm ARG WORKDIR=/var/www/html ENV DOCUMENT_ROOT=${WORKDIR} ENV LARAVEL_PROCS_NUMBER=1 diff --git a/src/docker/8.3/Dockerfile b/src/docker/8.3/Dockerfile index ca5ac19..f852fd2 100644 --- a/src/docker/8.3/Dockerfile +++ b/src/docker/8.3/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3-rc-fpm +FROM php:8.3.0-fpm ARG WORKDIR=/var/www/html ENV DOCUMENT_ROOT=${WORKDIR} ENV LARAVEL_PROCS_NUMBER=1 diff --git a/src/docker/8.3/Dockerfile.alpine b/src/docker/8.3/Dockerfile.alpine new file mode 100644 index 0000000..8a87db6 --- /dev/null +++ b/src/docker/8.3/Dockerfile.alpine @@ -0,0 +1,21 @@ +FROM php:8.3-fpm-alpine +ARG WORKDIR=/var/www/html +ENV DOCUMENT_ROOT=${WORKDIR} +ENV LARAVEL_PROCS_NUMBER=1 +ARG HOST_UID=1000 +ENV USER=www-data + +# Install the PHP pdo_mysql extention +RUN docker-php-ext-install pdo_mysql + +# Install Composer +RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer + +# Set working directory +WORKDIR $WORKDIR + +RUN rm -Rf /var/www/* && \ +mkdir -p /var/www/html + +ADD src/index.php $WORKDIR/index.php +ADD src/php.ini $PHP_INI_DIR/conf.d/