From 03951bbd3ecdb5ae34f6b9b75052e7c4f84e0d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leszek=20Krupin=CC=81ski?= Date: Sun, 9 Mar 2025 23:15:04 +0100 Subject: [PATCH 1/7] Dockerfile to serve production build --- Dockerfile | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index e901a7c..1d4c73d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,4 @@ -FROM php:7.4-alpine +FROM nginx:latest -RUN apk add --no-cache git curl -RUN curl -o /usr/bin/composer https://getcomposer.org/download/2.2.6/composer.phar -RUN chmod 755 /usr/bin/composer - -VOLUME /app -WORKDIR /app -EXPOSE 8000 - -CMD ["/usr/bin/composer"] \ No newline at end of file +RUN rm -r /usr/share/nginx/html +COPY output_prod /usr/share/nginx/html From 44666ee5e9ab0b0239bd2cf4dd5855e30782fbe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leszek=20Krupin=CC=81ski?= Date: Sun, 9 Mar 2025 23:25:07 +0100 Subject: [PATCH 2/7] Workflow for building and pushing docker image --- .github/workflows/main.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eead9b1..88da1a6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,3 +28,28 @@ jobs: - name: Output run: cat build_output.log + docker: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v4 + - + name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ vars.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - + name: Build and push + uses: docker/build-push-action@v6 + with: + context: . + push: true + tags: phperspl/phpers-website:latest \ No newline at end of file From 4bf4f23c062eac1fe131ee2b2cf5ba31c2cd6e4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leszek=20Krupin=CC=81ski?= Date: Sun, 9 Mar 2025 23:28:32 +0100 Subject: [PATCH 3/7] separate workflows --- .github/workflows/{main.yml => deploy.yml} | 4 +--- .github/workflows/test.yml | 28 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) rename .github/workflows/{main.yml => deploy.yml} (95%) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/main.yml b/.github/workflows/deploy.yml similarity index 95% rename from .github/workflows/main.yml rename to .github/workflows/deploy.yml index 88da1a6..202a347 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/deploy.yml @@ -1,10 +1,8 @@ -name: Test build +name: Deploy build on: push: branches: [ master ] - pull_request: - branches: [ master ] workflow_dispatch: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..5e5eade --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,28 @@ +name: Test build + +on: + pull_request: + branches: [ master ] + + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-20.04 + + steps: + - uses: actions/checkout@v2 + + - name: Install dependencies + uses: php-actions/composer@v6 + with: + php_version: "7.4" + version: 2 + + - name: Build + run: | + php7.4 vendor/bin/sculpin generate -vvv -n --env=prod > build_output.log + if grep -iq "notice\|error\|warning" build_output.log ; then return 1; fi + + - name: Output + run: cat build_output.log \ No newline at end of file From f256c8e464c0330a5a7a736506645f8794c46e0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leszek=20Krupin=CC=81ski?= Date: Sun, 9 Mar 2025 23:30:01 +0100 Subject: [PATCH 4/7] Temporarily build on pull request --- .github/workflows/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 202a347..1828988 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,6 +3,8 @@ name: Deploy build on: push: branches: [ master ] + pull_request: # Temporarily! + branches: [ master ] workflow_dispatch: From 342e7bc03442a520b698d9b16df94cc5ef69e001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leszek=20Krupin=CC=81ski?= Date: Sun, 9 Mar 2025 23:32:52 +0100 Subject: [PATCH 5/7] merge jobs --- .github/workflows/deploy.yml | 18 +++++++----------- .github/workflows/test.yml | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1828988..d722c08 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -9,12 +9,13 @@ on: workflow_dispatch: jobs: - build: - runs-on: ubuntu-20.04 - + docker: + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - + - + name: Checkout + uses: actions/checkout@v4 + - name: Install dependencies uses: php-actions/composer@v6 with: @@ -28,12 +29,7 @@ jobs: - name: Output run: cat build_output.log - docker: - runs-on: ubuntu-latest - steps: - - - name: Checkout - uses: actions/checkout@v4 + - name: Login to Docker Hub uses: docker/login-action@v3 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5e5eade..5a375d5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: jobs: - build: + test: runs-on: ubuntu-20.04 steps: From a5441ac78f55fc6b2266d38e7438f221779d4b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leszek=20Krupin=CC=81ski?= Date: Sun, 9 Mar 2025 23:34:51 +0100 Subject: [PATCH 6/7] use older ubuntu for build --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d722c08..b55eec6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,12 +10,12 @@ on: jobs: docker: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout uses: actions/checkout@v4 - + - name: Install dependencies uses: php-actions/composer@v6 with: From 8e1f6c8d7fac753d175299c56418d8e35fa92881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leszek=20Krupin=CC=81ski?= Date: Sun, 9 Mar 2025 23:39:57 +0100 Subject: [PATCH 7/7] cleanup --- .github/workflows/deploy.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b55eec6..07d7f96 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,8 +3,6 @@ name: Deploy build on: push: branches: [ master ] - pull_request: # Temporarily! - branches: [ master ] workflow_dispatch: