Skip to content

Commit

Permalink
Merge pull request #64 from jkaninda/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
jkaninda committed Dec 8, 2023
2 parents f409343 + 78ab267 commit 5f69345
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 13 deletions.
18 changes: 13 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
"${{env.BUILDKIT_IMAGE}}:8.3.0-fpm"
"${{env.BUILDKIT_IMAGE}}:latest"
27 changes: 23 additions & 4 deletions .github/workflows/manual.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -90,4 +88,25 @@ jobs:
push: true
platforms: linux/amd64,linux/arm64
tags: |
"${{env.BUILDKIT_IMAGE}}:8.2-alpine"
"${{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"

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


## PHP Version:
- 8.3.0RC3
- 8.3
- 8.2
- 8.1
- 8.0
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/docker/8.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/docker/8.3/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
21 changes: 21 additions & 0 deletions src/docker/8.3/Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -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/

0 comments on commit 5f69345

Please sign in to comment.