diff --git a/.forgejo/workflows/build_dev.yaml b/.forgejo/workflows/build_dev.yaml index e58b66f..9b66573 100644 --- a/.forgejo/workflows/build_dev.yaml +++ b/.forgejo/workflows/build_dev.yaml @@ -58,7 +58,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 with: - endpoint: tcp://forgejo-docker-in-docker-1:2375 + endpoint: tcp://docker-in-docker:2375 platforms: linux/amd64,linux/arm64,linux/arm/v7 - name: Build and push diff --git a/.forgejo/workflows/build_main.yaml b/.forgejo/workflows/build_main.yaml index fbff97b..32ca9bb 100755 --- a/.forgejo/workflows/build_main.yaml +++ b/.forgejo/workflows/build_main.yaml @@ -59,8 +59,6 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - with: - endpoint: tcp://forgejo-docker-in-docker-1:2375 - name: Build and push uses: docker/build-push-action@v6 diff --git a/README.md b/README.md index 2ce95c5..5af4046 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # docker-ownDynDNS-netcup +[![Worklfow](https://code.offene.cloud/homelab/docker-ownDynDNS-netcup/badges/workflows/build_main.yaml/badge.svg)](https://code.offene.cloud/homelab/docker-ownDynDNS-netcup) [![Release](https://code.offene.cloud/homelab/docker-ownDynDNS-netcup/badges/release.svg)](https://code.offene.cloud/homelab/docker-ownDynDNS-netcup/releases) + - [docker-ownDynDNS-netcup](#docker-owndyndns-netcup) - [acknowledgments](#acknowledgments) - [Netcup configuration](#netcup-configuration) @@ -13,22 +15,28 @@ This container is based on the work of: * [Fernwerker ownDynDNS](https://github.com/fernwerker/ownDynDNS) ## Netcup configuration -You need to create your dns entries beforehand: +You need to create two dns entries beforehand: -| Host | Type | Destination | +| Host | Type | Destination | |----------|-------|--------------| -| vpn | AAAA | IPv6 | +| vpn | AAAA | IPv6 | | vpn | A | IPv4 | +| ddns | AAAA | IPv6 | +| ddns | A | IPv4 | + +vpn.example.com -> the domain that gets updated + +ddns.example.com -> the domain your Fritz!Box calls for updates ## Container configuration -Create docker-compose.yml and config in your app directory i.e.: +Create compose.yml and config in your app directory i.e.: ``` mkdir -p /opt/docker/owndyndns cd /opt/docker/owndyndns # Create docker-compose.yml and copy the contents from repository file -vi docker-compose.yml +vi compose.yml # Create config, copy the contents from repository example.config and change the parameters vi config @@ -41,8 +49,8 @@ docker compose up -d * Login to your Fritz!Box * Go to /Internet/Freigabe/DynDNS * Set mark on "DynDNS benutzen" -* Enter Update-URL: `https:///update.php?user=&password=&ipv4=&ipv6=&domain=` - * You only have to change `https://` (http without valid TLS certificate) +* Enter Update-URL: `https://ddns.example.com/update.php?user=&password=&ipv4=&ipv6=&domain=` + * You only have to change `https://ddns.example.com` (http without valid TLS certificate) * Domainname: `vpn.example.com` * Username: Defined in config * Password: Defined in config diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile index b22d35e..9076bf8 100755 --- a/docker-build/Dockerfile +++ b/docker-build/Dockerfile @@ -1,5 +1,5 @@ # Get latest app version -FROM alpine:3.20.2 +FROM alpine:3.22.0 WORKDIR /clone-workspace RUN apk update && \ apk upgrade && \ @@ -7,7 +7,7 @@ RUN apk update && \ git clone https://github.com/fernwerker/ownDynDNS.git # Build container to run the app -FROM php:8.3.10-apache +FROM php:8.4.8-apache WORKDIR /var/www/html RUN apt-get update && \ diff --git a/docker-compose.yaml b/docker-compose.yaml index c7f9ce8..e16d166 100755 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,5 +1,4 @@ -version: "3" - +--- services: ownDynDNS: image: sujiba/docker-owndyndns-netcup:latest diff --git a/renovate.json b/renovate.json index 54e8d35..04b75bc 100644 --- a/renovate.json +++ b/renovate.json @@ -3,12 +3,12 @@ "extends": [ "local>homelab/renovate-config" ], - "baseBranches": ["dev"], + "baseBranches": ["main"], "useBaseBranchConfig": "merge", "packageRules": [ { "description": "Automerge dependency updates", - "matchUpdateTypes": ["major", "minor", "patch", "pin", "digest"], + "matchUpdateTypes": ["minor", "patch", "pin", "digest"], "automerge": true } ] diff --git a/renovate.json_dev b/renovate.json_dev new file mode 100644 index 0000000..54e8d35 --- /dev/null +++ b/renovate.json_dev @@ -0,0 +1,15 @@ +{ + "$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