From 02aab20114b005dce5fa6c409a1f3195c3582c0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aimee=20Wei=C3=9F?= Date: Tue, 13 Feb 2024 13:19:14 +0100 Subject: [PATCH 01/14] increase nextcloud version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c02d992..2a8d7b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM nextcloud:26.0.8 AS base +FROM nextcloud:27.1.6 AS base USER root From 8a44e8684dbfe27948c5c41b21e90cdbca0390c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aimee=20Wei=C3=9F?= Date: Tue, 13 Feb 2024 13:31:18 +0100 Subject: [PATCH 02/14] add workflow to publish on ghcr --- .../{push_docker.yml => publish_image.yml} | 2 +- .github/workflows/publish_image_on_push.yml | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) rename .github/workflows/{push_docker.yml => publish_image.yml} (98%) create mode 100644 .github/workflows/publish_image_on_push.yml diff --git a/.github/workflows/push_docker.yml b/.github/workflows/publish_image.yml similarity index 98% rename from .github/workflows/push_docker.yml rename to .github/workflows/publish_image.yml index df3dd4f..eb6f844 100644 --- a/.github/workflows/push_docker.yml +++ b/.github/workflows/publish_image.yml @@ -1,4 +1,4 @@ -name: Publish Docker Image +name: Publish Image to Docker on: push: diff --git a/.github/workflows/publish_image_on_push.yml b/.github/workflows/publish_image_on_push.yml new file mode 100644 index 0000000..e7f637e --- /dev/null +++ b/.github/workflows/publish_image_on_push.yml @@ -0,0 +1,23 @@ +name: Publish Image to GHCR on push + +on: + push: + branches-ignore: + - main + +jobs: + build_image_on_push: + name: "Publish image and scan with trivy" + if: ${{ github.event_name == 'push' }} + permissions: + packages: write + security-events: write + contents: read + uses: dBildungsplattform/dbp-github-workflows/.github/workflows/image-publish-trivy.yaml@5.0.0 + with: + image_name: "schulcloud-nextcloud" + run_trivy_scan: true + image_tag_generation: 'ticket_from_branch' + container_registry: "ghcr.io" + fail_on_vulnerabilites: true + report_location: "Dockerfile" \ No newline at end of file From 279b54bffd2378bb77fb8348049b600524229975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aimee=20Wei=C3=9F?= Date: Tue, 13 Feb 2024 14:43:29 +0100 Subject: [PATCH 03/14] change to 27.0.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2a8d7b6..cb6ed18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM nextcloud:27.1.6 AS base +FROM nextcloud:27.0.0 AS base USER root From 0830acd80fbded216142f3b397cc5a89741bb1d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aimee=20Wei=C3=9F?= Date: Wed, 14 Feb 2024 11:03:14 +0100 Subject: [PATCH 04/14] delete cmd command --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cb6ed18..ffe264f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,4 +28,5 @@ COPY ./src /usr/nextcloud RUN mkdir /var/www/html/custom_apps/ \ && sudo chown -R www-data /var/www/html/custom_apps/ -CMD ["/usr/bin/supervisord", "-c", "/usr/nextcloud/supervisord.conf"] +# CMD ["/usr/bin/supervisord", "-c", "/usr/nextcloud/supervisord.conf"] +CMD [""] From 43a36d207626e374a2eb4a61b7ed2ab587770cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aimee=20Wei=C3=9F?= Date: Wed, 14 Feb 2024 11:40:51 +0100 Subject: [PATCH 05/14] nextlcou version 26.0.10 --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ffe264f..43f01ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM nextcloud:27.0.0 AS base +FROM nextcloud:26.0.10 AS base USER root @@ -28,5 +28,4 @@ COPY ./src /usr/nextcloud RUN mkdir /var/www/html/custom_apps/ \ && sudo chown -R www-data /var/www/html/custom_apps/ -# CMD ["/usr/bin/supervisord", "-c", "/usr/nextcloud/supervisord.conf"] -CMD [""] +CMD ["/usr/bin/supervisord", "-c", "/usr/nextcloud/supervisord.conf"] From e164db529674f475e053fade3b921c3a6abe3656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aimee=20Wei=C3=9F?= Date: Wed, 14 Feb 2024 13:53:46 +0100 Subject: [PATCH 06/14] disable command --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 43f01ff..99e382c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM nextcloud:26.0.10 AS base +FROM nextcloud:27.0.2 AS base USER root @@ -28,4 +28,4 @@ COPY ./src /usr/nextcloud RUN mkdir /var/www/html/custom_apps/ \ && sudo chown -R www-data /var/www/html/custom_apps/ -CMD ["/usr/bin/supervisord", "-c", "/usr/nextcloud/supervisord.conf"] +# CMD ["/usr/bin/supervisord", "-c", "/usr/nextcloud/supervisord.conf"] From 5d1ad998ab0c7ca72b97246b2f6f1e72d3b39696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aimee=20Wei=C3=9F?= Date: Thu, 15 Feb 2024 10:19:25 +0100 Subject: [PATCH 07/14] comment in command --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 99e382c..8012337 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,4 +28,4 @@ COPY ./src /usr/nextcloud RUN mkdir /var/www/html/custom_apps/ \ && sudo chown -R www-data /var/www/html/custom_apps/ -# CMD ["/usr/bin/supervisord", "-c", "/usr/nextcloud/supervisord.conf"] +CMD ["/usr/bin/supervisord", "-c", "/usr/nextcloud/supervisord.conf"] From 5ca567c75d882978a406b809efd3dbcff0e69aad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aimee=20Wei=C3=9F?= Date: Thu, 15 Feb 2024 13:34:06 +0100 Subject: [PATCH 08/14] test empty target --- .github/workflows/publish_image_on_push.yml | 5 +++-- Dockerfile | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish_image_on_push.yml b/.github/workflows/publish_image_on_push.yml index e7f637e..b5d67d3 100644 --- a/.github/workflows/publish_image_on_push.yml +++ b/.github/workflows/publish_image_on_push.yml @@ -13,11 +13,12 @@ jobs: packages: write security-events: write contents: read - uses: dBildungsplattform/dbp-github-workflows/.github/workflows/image-publish-trivy.yaml@5.0.0 + uses: dBildungsplattform/dbp-github-workflows/.github/workflows/image-publish-trivy.yaml@OPS-5649-update-nextcloud with: image_name: "schulcloud-nextcloud" run_trivy_scan: true image_tag_generation: 'ticket_from_branch' container_registry: "ghcr.io" fail_on_vulnerabilites: true - report_location: "Dockerfile" \ No newline at end of file + report_location: "Dockerfile" + target: "" \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 8012337..4c05ebc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,5 +27,5 @@ COPY ./src /usr/nextcloud # for mounting RUN mkdir /var/www/html/custom_apps/ \ && sudo chown -R www-data /var/www/html/custom_apps/ - + CMD ["/usr/bin/supervisord", "-c", "/usr/nextcloud/supervisord.conf"] From 69d72f7fe580425e0afd92472f3f5a97b2dfda96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aimee=20Wei=C3=9F?= Date: Thu, 15 Feb 2024 13:34:27 +0100 Subject: [PATCH 09/14] test empty target --- .github/workflows/publish_image_on_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_image_on_push.yml b/.github/workflows/publish_image_on_push.yml index b5d67d3..6982ef9 100644 --- a/.github/workflows/publish_image_on_push.yml +++ b/.github/workflows/publish_image_on_push.yml @@ -21,4 +21,4 @@ jobs: container_registry: "ghcr.io" fail_on_vulnerabilites: true report_location: "Dockerfile" - target: "" \ No newline at end of file + # target: "" \ No newline at end of file From 85cdc0883f93ee07b9a178c6f598272b8170c7ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aimee=20Wei=C3=9F?= Date: Thu, 15 Feb 2024 13:39:02 +0100 Subject: [PATCH 10/14] add target production --- .github/workflows/publish_image_on_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_image_on_push.yml b/.github/workflows/publish_image_on_push.yml index 6982ef9..d28b60e 100644 --- a/.github/workflows/publish_image_on_push.yml +++ b/.github/workflows/publish_image_on_push.yml @@ -21,4 +21,4 @@ jobs: container_registry: "ghcr.io" fail_on_vulnerabilites: true report_location: "Dockerfile" - # target: "" \ No newline at end of file + target: "production" \ No newline at end of file From afe6a91196da2bee90e2688b02ef181f74afc51b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aimee=20Wei=C3=9F?= Date: Thu, 15 Feb 2024 13:54:24 +0100 Subject: [PATCH 11/14] remove typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4c05ebc..8012337 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,5 +27,5 @@ COPY ./src /usr/nextcloud # for mounting RUN mkdir /var/www/html/custom_apps/ \ && sudo chown -R www-data /var/www/html/custom_apps/ - + CMD ["/usr/bin/supervisord", "-c", "/usr/nextcloud/supervisord.conf"] From 0addf8a8292210c8ce70a41c1fc8f4261aa4043f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aimee=20Wei=C3=9F?= Date: Thu, 15 Feb 2024 14:34:41 +0100 Subject: [PATCH 12/14] update used workflow --- .github/workflows/publish_image_on_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_image_on_push.yml b/.github/workflows/publish_image_on_push.yml index d28b60e..6430667 100644 --- a/.github/workflows/publish_image_on_push.yml +++ b/.github/workflows/publish_image_on_push.yml @@ -13,7 +13,7 @@ jobs: packages: write security-events: write contents: read - uses: dBildungsplattform/dbp-github-workflows/.github/workflows/image-publish-trivy.yaml@OPS-5649-update-nextcloud + uses: dBildungsplattform/dbp-github-workflows/.github/workflows/image-publish-trivy.yaml@5.0.1 with: image_name: "schulcloud-nextcloud" run_trivy_scan: true From 81afaaa8f7cb970abbbb80133139e5d40b387b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aimee=20Wei=C3=9F?= Date: Thu, 15 Feb 2024 14:39:26 +0100 Subject: [PATCH 13/14] update nextcloud version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8012337..2a8d7b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM nextcloud:27.0.2 AS base +FROM nextcloud:27.1.6 AS base USER root From 4faa4409ef2c289cfaf8ccd61df2519aa3a22085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aimee=20Wei=C3=9F?= Date: Thu, 15 Feb 2024 15:44:35 +0100 Subject: [PATCH 14/14] update to version 28 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2a8d7b6..7874609 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM nextcloud:27.1.6 AS base +FROM nextcloud:28.0.2 AS base USER root