diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4dd7060..eb28434 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,14 +1,9 @@ -name: ci +name: Docker image build and Push Image to registry on: push: branches: - '**' - pull_request: - types: - - closed - branches: - - '**' env: #BRANCH_NAME: ${{ github.head_ref || github.ref_name }} diff --git a/Dockerfile b/Dockerfile index e7d4af5..9a57814 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM php:8.2.0RC5-fpm ARG WORKDIR=/var/www/html ENV DOCUMENT_ROOT=${WORKDIR} ENV LARAVEL_PROCS_NUMBER=1 -ENV NODE_VERSION=16.x +ENV NODE_VERSION=17.x # Install system dependencies RUN apt-get update && apt-get install -y \ git \ diff --git a/README.md b/README.md index 130082d..938ea96 100644 --- a/README.md +++ b/README.md @@ -79,15 +79,18 @@ services: - default #if you're using networks between containers #Nginx server nginx-server: - image: nginx:alpine - container_name: nginx-server - restart: unless-stopped - ports: + image: jkaninda/nginx-fpm:alpine + container_name: nginx-server + restart: unless-stopped + ports: - 80:80 - volumes: + volumes: - ./:/var/www/html - - ./default.conf:/etc/nginx/conf.d/default.conf - networks: + environment: + - DOCUMENT_ROOT=/var/www/html/public + - CLIENT_MAX_BODY_SIZE=20M + - PHP_FPM_HOST=php-fpm:9000 + networks: - default ``` diff --git a/docker-compose.yml b/docker-compose.yml index f687f1e..f05d772 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,13 +11,16 @@ services: - default #if you're using networks between containers #Nginx server nginx-server: - image: nginx:alpine + image: jkaninda/nginx-fpm:alpine container_name: nginx-server restart: unless-stopped ports: - 80:80 volumes: - ./laravel:/var/www/html - - ./example/default.conf:/etc/nginx/conf.d/default.conf + environment: + - DOCUMENT_ROOT=/var/www/html/public + - CLIENT_MAX_BODY_SIZE=20M + - PHP_FPM_HOST=php-fpm:9000 networks: - default diff --git a/entrypoint.sh b/entrypoint.sh index 4315990..e29a1a2 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -17,14 +17,14 @@ if [ -f /var/www/html/artisan ]; then cat > "$TASK" <