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.yaml similarity index 100% rename from .forgejo/workflows/build_main.yaml rename to .forgejo/workflows/build.yaml diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile index 5dcefad..d843ac6 100755 --- a/docker-build/Dockerfile +++ b/docker-build/Dockerfile @@ -3,20 +3,21 @@ FROM alpine:3.20.1 WORKDIR /clone-workspace RUN apk update && \ apk upgrade && \ - apk add git && \ - git clone https://github.com/fernwerker/ownDynDNS.git + apk add git +RUN 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 && \ +RUN apt-get update -y && \ apt-get upgrade -y && \ - apt-get install --no-install-recommends -y \ - libxml2-dev && \ - docker-php-ext-install soap && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* + apt-get install -y \ + libxml2-dev +RUN docker-php-ext-install soap +RUN apt-get clean -y -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 +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/ diff --git a/renovate.json b/renovate.json index 54e8d35..df754de 100644 --- a/renovate.json +++ b/renovate.json @@ -2,14 +2,5 @@ "$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 +}