From b41dc0d28f31229cb0e4bfe2e73abd98c5fd136f Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Wed, 4 Jan 2023 17:30:37 +0200 Subject: [PATCH] Refactoring --- .github/workflows/build.yml | 55 ++++++++++++++++++++----------------- build.sh | 2 +- docker/7.4/Dockerfile | 6 ++-- docker/8.0/Dockerfile | 6 ++-- docker/8.1/Dockerfile | 9 +++--- docker/8.2/Dockerfile | 12 ++++---- 6 files changed, 51 insertions(+), 39 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7acce16..997b45e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,32 +1,15 @@ -name: Docker build - +name: Build on: - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - inputs: - docker_tag: - description: 'Docker tag' - required: true - default: 'latest' - type: string + push: + branches: + - main env: - #BRANCH_NAME: ${{ github.head_ref || github.ref_name }} BUILDKIT_IMAGE: jkaninda/laravel-php-fpm jobs: docker: runs-on: ubuntu-latest steps: - - - name: Set environment for branch - run: | - set -x - if [[ ${{ inputs.docker_tag }} == 'latest' ]]; then - TAG_NAME=8.1 - echo "Build latest tag'" - else - TAG_NAME=${{ inputs.docker_tag }} - fi - name: Set up QEMU uses: docker/setup-qemu-action@v2 @@ -40,10 +23,32 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and push + name: Build and push 7.4 uses: docker/build-push-action@v3 with: - context: ./ - file: "./docker/${{TAG_NAME}}/Dockerfile" + file: "./docker/7.4/Dockerfile" push: true - tags: "${{env.BUILDKIT_IMAGE}}:${{env.TAG_NAME}}" \ No newline at end of file + tags: "${{env.BUILDKIT_IMAGE}}:7.4" + - + name: Build and push 8.0 + uses: docker/build-push-action@v3 + with: + file: "./docker/8.0/Dockerfile" + push: true + tags: "${{env.BUILDKIT_IMAGE}}:8.0" + - + name: Build and push 8.1 + uses: docker/build-push-action@v3 + with: + file: "./docker/8.1/Dockerfile" + push: true + tags: "${{env.BUILDKIT_IMAGE}}:8.1" + - + name: Build and push 8.2 + uses: docker/build-push-action@v3 + with: + file: "./docker/8.2/Dockerfile" + push: true + tags: | + "${{env.BUILDKIT_IMAGE}}:8.2" + "${{env.BUILDKIT_IMAGE}}:latest" \ No newline at end of file diff --git a/build.sh b/build.sh index 9beb278..2181309 100755 --- a/build.sh +++ b/build.sh @@ -11,7 +11,7 @@ then docker build -f docker/${tag}/Dockerfile -t jkaninda/laravel-php-fpm:$tag . else echo 'Build latest' - docker build -f docker/8.1/Dockerfile -t jkaninda/laravel-php-fpm:$tag . + docker build -f docker/8.2/Dockerfile -t jkaninda/laravel-php-fpm:$tag . fi diff --git a/docker/7.4/Dockerfile b/docker/7.4/Dockerfile index 7715614..06ea974 100644 --- a/docker/7.4/Dockerfile +++ b/docker/7.4/Dockerfile @@ -3,6 +3,8 @@ ARG WORKDIR=/var/www/html ENV DOCUMENT_ROOT=${WORKDIR} ENV LARAVEL_PROCS_NUMBER=1 ENV NODE_VERSION=16.x +ARG HOST_UID=1000 +ENV USER=www-data # Install system dependencies RUN apt-get update && apt-get install -y \ git \ @@ -82,8 +84,8 @@ ENTRYPOINT ["entrypoint.sh"] -RUN usermod -u 1000 www-data -RUN groupmod -g 1000 www-data +RUN usermod -u ${HOST_UID} www-data +RUN groupmod -g ${HOST_UID} www-data RUN chmod -R 755 $WORKDIR RUN chown -R www-data:www-data $WORKDIR diff --git a/docker/8.0/Dockerfile b/docker/8.0/Dockerfile index e25af20..862b394 100644 --- a/docker/8.0/Dockerfile +++ b/docker/8.0/Dockerfile @@ -3,6 +3,8 @@ ARG WORKDIR=/var/www/html ENV DOCUMENT_ROOT=${WORKDIR} ENV LARAVEL_PROCS_NUMBER=1 ENV NODE_VERSION=16.x +ARG HOST_UID=1000 +ENV USER=www-data # Install system dependencies RUN apt-get update && apt-get install -y \ git \ @@ -82,8 +84,8 @@ ENTRYPOINT ["entrypoint.sh"] -RUN usermod -u 1000 www-data -RUN groupmod -g 1000 www-data +RUN usermod -u ${HOST_UID} www-data +RUN groupmod -g ${HOST_UID} www-data RUN chmod -R 755 $WORKDIR RUN chown -R www-data:www-data $WORKDIR diff --git a/docker/8.1/Dockerfile b/docker/8.1/Dockerfile index 4e91e11..a1f8223 100644 --- a/docker/8.1/Dockerfile +++ b/docker/8.1/Dockerfile @@ -1,8 +1,10 @@ -FROM php:8.1.11-fpm +FROM php:8.1.13-fpm ARG WORKDIR=/var/www/html ENV DOCUMENT_ROOT=${WORKDIR} ENV LARAVEL_PROCS_NUMBER=1 ENV NODE_VERSION=17.x +ARG HOST_UID=1000 +ENV USER=www-data # Install system dependencies RUN apt-get update && apt-get install -y \ git \ @@ -81,9 +83,8 @@ RUN ln -s /usr/local/bin/entrypoint.sh / ENTRYPOINT ["entrypoint.sh"] - -RUN usermod -u 1000 www-data -RUN groupmod -g 1000 www-data +RUN usermod -u ${HOST_UID} www-data +RUN groupmod -g ${HOST_UID} www-data RUN chmod -R 755 $WORKDIR RUN chown -R www-data:www-data $WORKDIR diff --git a/docker/8.2/Dockerfile b/docker/8.2/Dockerfile index bb08b74..f6463b9 100644 --- a/docker/8.2/Dockerfile +++ b/docker/8.2/Dockerfile @@ -1,8 +1,10 @@ -FROM php:8.2.0RC5-fpm +FROM php:8.2.0-fpm ARG WORKDIR=/var/www/html ENV DOCUMENT_ROOT=${WORKDIR} ENV LARAVEL_PROCS_NUMBER=1 ENV NODE_VERSION=17.x +ARG HOST_UID=1000 +ENV USER=www-data # Install system dependencies RUN apt-get update && apt-get install -y \ git \ @@ -24,9 +26,9 @@ RUN apt-get update && apt-get install -y \ nano \ cron -#RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash - +RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash - # Install Node -#RUN apt-get install -y nodejs +RUN apt-get install -y nodejs # Clear cache RUN apt-get clean && rm -rf /var/lib/apt/lists/* # Install Kafka @@ -82,8 +84,8 @@ ENTRYPOINT ["entrypoint.sh"] -RUN usermod -u 1000 www-data -RUN groupmod -g 1000 www-data +RUN usermod -u ${HOST_UID} www-data +RUN groupmod -g ${HOST_UID} www-data RUN chmod -R 755 $WORKDIR RUN chown -R www-data:www-data $WORKDIR