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.yaml b/.forgejo/workflows/build_main.yaml similarity index 100% rename from .forgejo/workflows/build.yaml rename to .forgejo/workflows/build_main.yaml diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile index d843ac6..5dcefad 100755 --- a/docker-build/Dockerfile +++ b/docker-build/Dockerfile @@ -3,21 +3,20 @@ 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 WORKDIR /var/www/html -RUN apt-get update -y && \ +RUN apt-get update && \ apt-get upgrade -y && \ - apt-get install -y \ - libxml2-dev -RUN docker-php-ext-install soap -RUN apt-get clean -y + apt-get install --no-install-recommends -y \ + libxml2-dev && \ + docker-php-ext-install soap && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* -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 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