From 25a78fd2ec90eeca699486be2deece13512066b0 Mon Sep 17 00:00:00 2001 From: Saeed Vaziry Date: Sun, 16 Feb 2025 11:11:46 +0100 Subject: [PATCH 01/11] WIP --- .github/workflows/docker-test.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/docker-test.yml diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml new file mode 100644 index 000000000..6903d6717 --- /dev/null +++ b/.github/workflows/docker-test.yml @@ -0,0 +1,30 @@ +name: Docker Test + +on: + pull_request: + +jobs: + build-and-push: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Build + run: | + docker buildx build . \ + -f docker/Dockerfile \ + -t vitodeploy/vito:2.x \ + --platform linux/amd64,linux/arm64 From cbfcef7de1ddbee3254729416d13e16bf550cdb7 Mon Sep 17 00:00:00 2001 From: Saeed Vaziry Date: Sun, 16 Feb 2025 11:16:05 +0100 Subject: [PATCH 02/11] WIP --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index dcf28d49e..de53355e7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /var/www/html ENV DEBIAN_FRONTEND noninteractive # upgrade -RUN apt-get clean && apt-get update && apt-get update && apt-get upgrade -y && apt-get autoremove -y +RUN apt-get update && apt-get upgrade -y && apt-get autoremove -y # requirements RUN apt-get install -y software-properties-common curl zip unzip gcc From b5ee80df22beaf74534094c3444d2bf1ee05beb8 Mon Sep 17 00:00:00 2001 From: Saeed Vaziry Date: Sun, 16 Feb 2025 11:21:01 +0100 Subject: [PATCH 03/11] WIP --- .github/workflows/docker-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index 6903d6717..613d0103f 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -22,6 +22,9 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Build Requirements + run: docker run --privileged --rm tonistiigi/binfmt --install all + - name: Build run: | docker buildx build . \ From 92f04570f9988f5256c1e7b18ab1e6f8056a80a8 Mon Sep 17 00:00:00 2001 From: Saeed Vaziry Date: Sun, 16 Feb 2025 11:24:42 +0100 Subject: [PATCH 04/11] WIP --- .github/workflows/docker-test.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index 613d0103f..bdb4edb68 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -8,13 +8,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Login to Docker Hub uses: docker/login-action@v2 @@ -22,9 +22,6 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Build Requirements - run: docker run --privileged --rm tonistiigi/binfmt --install all - - name: Build run: | docker buildx build . \ From 86291726dcff18da886ea933c9b9efba1a94218f Mon Sep 17 00:00:00 2001 From: Saeed Vaziry Date: Sun, 16 Feb 2025 11:26:58 +0100 Subject: [PATCH 05/11] WIP --- .github/workflows/docker-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index bdb4edb68..b3e8f51f3 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -22,6 +22,9 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Build Requirements + run: docker run --privileged --rm tonistiigi/binfmt --install all + - name: Build run: | docker buildx build . \ From ae64f9560c4fe586ad785a632c701fce13113d0d Mon Sep 17 00:00:00 2001 From: Saeed Vaziry Date: Sun, 16 Feb 2025 11:35:45 +0100 Subject: [PATCH 06/11] WIP --- .github/workflows/docker-test.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index b3e8f51f3..b518dbb7b 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -15,6 +15,8 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + with: + version: v0.20.0 - name: Login to Docker Hub uses: docker/login-action@v2 @@ -22,9 +24,6 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Build Requirements - run: docker run --privileged --rm tonistiigi/binfmt --install all - - name: Build run: | docker buildx build . \ From 496674a3c9d3c389ba8775589145b422a664586a Mon Sep 17 00:00:00 2001 From: Saeed Vaziry Date: Sun, 16 Feb 2025 12:03:26 +0100 Subject: [PATCH 07/11] WIP --- .github/workflows/docker-test.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index b518dbb7b..1503049e6 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -15,8 +15,6 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - with: - version: v0.20.0 - name: Login to Docker Hub uses: docker/login-action@v2 @@ -25,8 +23,10 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} - name: Build - run: | - docker buildx build . \ - -f docker/Dockerfile \ - -t vitodeploy/vito:2.x \ - --platform linux/amd64,linux/arm64 + uses: docker/build-push-action@v4 + with: + context: . + file: docker/Dockerfile + platforms: linux/amd64,linux/arm64 + push: false + tags: vitodeploy/vito:latest From 106d36025bb79dbec507b0e71cf50718b26274b9 Mon Sep 17 00:00:00 2001 From: Saeed Vaziry Date: Sun, 16 Feb 2025 12:05:07 +0100 Subject: [PATCH 08/11] WIP --- .github/workflows/docker-test.yml | 12 +++++------- docker/Dockerfile | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index 1503049e6..b56978e2c 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -23,10 +23,8 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} - name: Build - uses: docker/build-push-action@v4 - with: - context: . - file: docker/Dockerfile - platforms: linux/amd64,linux/arm64 - push: false - tags: vitodeploy/vito:latest + run: | + docker buildx build . \ + -f docker/Dockerfile \ + -t vitodeploy/vito:latest \ + --platform linux/amd64,linux/arm64 diff --git a/docker/Dockerfile b/docker/Dockerfile index de53355e7..4c6b92dd2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 WORKDIR /var/www/html From 23610c9ea8dbb7c05d531763d1da8e9396e9a293 Mon Sep 17 00:00:00 2001 From: Saeed Vaziry Date: Sun, 16 Feb 2025 12:12:24 +0100 Subject: [PATCH 09/11] WIP --- .github/workflows/code-style.yml | 2 +- .github/workflows/tests.yml | 2 +- docker/Dockerfile | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml index e77a00857..d731bb14f 100644 --- a/.github/workflows/code-style.yml +++ b/.github/workflows/code-style.yml @@ -6,7 +6,7 @@ on: - main - 1.x - 2.x - pull_request: +# pull_request: jobs: code-style: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d89c2a245..a978de719 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -6,7 +6,7 @@ on: - main - 1.x - 2.x - pull_request: +# pull_request: jobs: tests: diff --git a/docker/Dockerfile b/docker/Dockerfile index 4c6b92dd2..826bfca35 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -8,16 +8,15 @@ ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get upgrade -y && apt-get autoremove -y # requirements -RUN apt-get install -y software-properties-common curl zip unzip gcc +RUN apt-get install -y software-properties-common curl zip unzip gcc \ + cron gnupg gosu curl ca-certificates zip unzip supervisor libcap2-bin libpng-dev \ + python2 dnsutils librsvg2-bin fswatch wget openssh-client # nginx RUN apt-get install -y nginx # php -RUN apt-get update \ - && apt-get install -y cron gnupg gosu curl ca-certificates zip unzip supervisor libcap2-bin libpng-dev \ - python2 dnsutils librsvg2-bin fswatch wget openssh-client \ - && add-apt-repository ppa:ondrej/php -y \ +RUN add-apt-repository ppa:ondrej/php -y \ && apt-get update \ && apt-get install -y php8.2 php8.2-fpm php8.2-mbstring php8.2-mcrypt php8.2-gd php8.2-xml \ php8.2-curl php8.2-gettext php8.2-zip php8.2-bcmath php8.2-soap php8.2-redis php8.2-sqlite3 php8.2-intl From 1f86dd450bb3c05f680af5337945f2f814cf2931 Mon Sep 17 00:00:00 2001 From: Saeed Vaziry Date: Sun, 16 Feb 2025 12:13:49 +0100 Subject: [PATCH 10/11] WIP --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 826bfca35..d45aa3742 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get autoremove -y # requirements RUN apt-get install -y software-properties-common curl zip unzip gcc \ cron gnupg gosu curl ca-certificates zip unzip supervisor libcap2-bin libpng-dev \ - python2 dnsutils librsvg2-bin fswatch wget openssh-client + dnsutils librsvg2-bin fswatch wget openssh-client # nginx RUN apt-get install -y nginx From b21a9823c43eef0efa787cb5bfb1a671b51b0a8c Mon Sep 17 00:00:00 2001 From: Saeed Vaziry Date: Sun, 16 Feb 2025 12:31:43 +0100 Subject: [PATCH 11/11] fix --- .github/workflows/code-style.yml | 2 +- .github/workflows/docker-test.yml | 30 ------------------------------ .github/workflows/tests.yml | 2 +- docker/Dockerfile | 13 +++++++------ 4 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 .github/workflows/docker-test.yml diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml index d731bb14f..e77a00857 100644 --- a/.github/workflows/code-style.yml +++ b/.github/workflows/code-style.yml @@ -6,7 +6,7 @@ on: - main - 1.x - 2.x -# pull_request: + pull_request: jobs: code-style: diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml deleted file mode 100644 index b56978e2c..000000000 --- a/.github/workflows/docker-test.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Docker Test - -on: - pull_request: - -jobs: - build-and-push: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Build - run: | - docker buildx build . \ - -f docker/Dockerfile \ - -t vitodeploy/vito:latest \ - --platform linux/amd64,linux/arm64 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a978de719..d89c2a245 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -6,7 +6,7 @@ on: - main - 1.x - 2.x -# pull_request: + pull_request: jobs: tests: diff --git a/docker/Dockerfile b/docker/Dockerfile index d45aa3742..3403b50d6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,22 +1,23 @@ -FROM ubuntu:24.04 +FROM ubuntu:22.04 WORKDIR /var/www/html ENV DEBIAN_FRONTEND noninteractive # upgrade -RUN apt-get update && apt-get upgrade -y && apt-get autoremove -y +RUN apt-get clean && apt-get update && apt-get update && apt-get upgrade -y && apt-get autoremove -y # requirements -RUN apt-get install -y software-properties-common curl zip unzip gcc \ - cron gnupg gosu curl ca-certificates zip unzip supervisor libcap2-bin libpng-dev \ - dnsutils librsvg2-bin fswatch wget openssh-client +RUN apt-get install -y software-properties-common curl zip unzip gcc # nginx RUN apt-get install -y nginx # php -RUN add-apt-repository ppa:ondrej/php -y \ +RUN apt-get update \ + && apt-get install -y cron gnupg gosu curl ca-certificates zip unzip supervisor libcap2-bin libpng-dev \ + dnsutils librsvg2-bin fswatch wget openssh-client \ + && add-apt-repository ppa:ondrej/php -y \ && apt-get update \ && apt-get install -y php8.2 php8.2-fpm php8.2-mbstring php8.2-mcrypt php8.2-gd php8.2-xml \ php8.2-curl php8.2-gettext php8.2-zip php8.2-bcmath php8.2-soap php8.2-redis php8.2-sqlite3 php8.2-intl