From b4baca252c965add5b63695ee64cbd68c664741d Mon Sep 17 00:00:00 2001 From: sujiba Date: Thu, 18 Jul 2024 10:29:45 +0200 Subject: [PATCH 1/6] feat(renovate): configuration --- renovate.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index df754de..54e8d35 100644 --- a/renovate.json +++ b/renovate.json @@ -2,5 +2,14 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ "local>homelab/renovate-config" + ], + "baseBranches": ["dev"], + "useBaseBranchConfig": "merge", + "packageRules": [ + { + "description": "Automerge dependency updates", + "matchUpdateTypes": ["major", "minor", "patch", "pin", "digest"], + "automerge": true + } ] -} +} \ No newline at end of file From 8ac8e2c311acd4e7742ca83af9ea96689f188c5f Mon Sep 17 00:00:00 2001 From: sujiba Date: Thu, 18 Jul 2024 10:31:13 +0200 Subject: [PATCH 2/6] feat(action): renamed main action --- .forgejo/workflows/{build.yaml => build-main.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .forgejo/workflows/{build.yaml => build-main.yaml} (100%) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build-main.yaml similarity index 100% rename from .forgejo/workflows/build.yaml rename to .forgejo/workflows/build-main.yaml From c013c6ac72c01a55c43ffaaa8cc3e001fcb8ea69 Mon Sep 17 00:00:00 2001 From: sujiba Date: Thu, 18 Jul 2024 10:32:12 +0200 Subject: [PATCH 3/6] feat(action): renamed actions --- .forgejo/workflows/{build-dev.yaml => build_dev.yaml} | 0 .forgejo/workflows/{build-main.yaml => build_main.yaml} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename .forgejo/workflows/{build-dev.yaml => build_dev.yaml} (100%) rename .forgejo/workflows/{build-main.yaml => build_main.yaml} (100%) diff --git a/.forgejo/workflows/build-dev.yaml b/.forgejo/workflows/build_dev.yaml similarity index 100% rename from .forgejo/workflows/build-dev.yaml rename to .forgejo/workflows/build_dev.yaml diff --git a/.forgejo/workflows/build-main.yaml b/.forgejo/workflows/build_main.yaml similarity index 100% rename from .forgejo/workflows/build-main.yaml rename to .forgejo/workflows/build_main.yaml From 837c11f553c2a80e39e324eac147a59a665a022f Mon Sep 17 00:00:00 2001 From: sujiba Date: Mon, 22 Jul 2024 23:56:02 +0200 Subject: [PATCH 4/6] feat(dockerfile): build improvements --- docker-build/Dockerfile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile index d843ac6..701640b 100755 --- a/docker-build/Dockerfile +++ b/docker-build/Dockerfile @@ -3,8 +3,8 @@ FROM alpine:3.20.1 WORKDIR /clone-workspace RUN apk update && \ apk upgrade && \ - apk add git -RUN git clone https://github.com/fernwerker/ownDynDNS.git + apk add git && \ + git clone https://github.com/fernwerker/ownDynDNS.git # Build container to run the app FROM php:8.3.9-apache @@ -12,12 +12,10 @@ WORKDIR /var/www/html RUN apt-get update -y && \ apt-get upgrade -y && \ - apt-get install -y \ - libxml2-dev -RUN docker-php-ext-install soap -RUN apt-get clean -y + apt-get install -y --no-install-recommends \ + libxml2-dev && \ + docker-php-ext-install soap && \ + apt-get clean -y -COPY --from=0 /clone-workspace/ownDynDNS /var/www/html -COPY --from=0 /clone-workspace/ownDynDNS/.htaccess.example /var/www/html/.htaccess - -RUN chown -R www-data:www-data /var/www/html/ +COPY --chown=www-data:www-data --from=0 /clone-workspace/ownDynDNS /var/www/html +COPY --chown=www-data:www-data --from=0 /clone-workspace/ownDynDNS/.htaccess.example /var/www/html/.htaccess From e5d737f3502995ceacec6668139e8f3b3b2a74b2 Mon Sep 17 00:00:00 2001 From: sujiba Date: Tue, 23 Jul 2024 00:02:30 +0200 Subject: [PATCH 5/6] fix(dokerfile): added missing && --- docker-build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile index 701640b..be4b1b3 100755 --- a/docker-build/Dockerfile +++ b/docker-build/Dockerfile @@ -12,7 +12,7 @@ WORKDIR /var/www/html RUN apt-get update -y && \ apt-get upgrade -y && \ - apt-get install -y --no-install-recommends \ + apt-get install -y --no-install-recommends && \ libxml2-dev && \ docker-php-ext-install soap && \ apt-get clean -y From fb9cdc217a993c4f76dbc33d4449f287b47c6820 Mon Sep 17 00:00:00 2001 From: sujiba Date: Tue, 23 Jul 2024 00:15:12 +0200 Subject: [PATCH 6/6] fix(dokerfile): no install recommends --- docker-build/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile index be4b1b3..5dcefad 100755 --- a/docker-build/Dockerfile +++ b/docker-build/Dockerfile @@ -10,12 +10,13 @@ RUN apk update && \ FROM php:8.3.9-apache WORKDIR /var/www/html -RUN apt-get update -y && \ +RUN apt-get update && \ apt-get upgrade -y && \ - apt-get install -y --no-install-recommends && \ + apt-get install --no-install-recommends -y \ libxml2-dev && \ docker-php-ext-install soap && \ - apt-get clean -y + apt-get clean && \ + rm -rf /var/lib/apt/lists/* COPY --chown=www-data:www-data --from=0 /clone-workspace/ownDynDNS /var/www/html COPY --chown=www-data:www-data --from=0 /clone-workspace/ownDynDNS/.htaccess.example /var/www/html/.htaccess