diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 69d2388..a3fb229 100755 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -19,12 +19,12 @@ jobs: latest_release=$(curl -s https://git.smail.koeln/api/v1/repos/homelab/docker-ownDynDNS-netcup/releases\?limit\=1 | jq -r '.[] | .tag_name') # Cut release into year, month and counter. - year=$(echo $latest_release | awk -F '.' '//{print $1}') - month=$(echo $latest_release | awk -F '.' '//{print $2}') + release_year=$(echo $latest_release | awk -F '.' '//{print $1}') + release_month=$(echo $latest_release | awk -F '.' '//{print $2}') counter=$(echo $latest_release | awk -F '.' '//{print $3}') # increase the counter, if the release is from the same year and month - if [[ $(date +'%Y') == $year ]] && [[ $(date +'%m') == $month ]]; then + if [ $(date +'%Y') -eq release_year ] && [ $(date +'%m') -eq release_month ]; then ((counter++)); # else reset counter else @@ -32,9 +32,8 @@ jobs: fi # Create - new_release=$(date +'%Y').$(date +'%m').$counter + new_release=$(date +'%Y').$(date +'mY').$counter echo "RELEASE=$new_release">> $GITHUB_ENV - echo "Release $new_release successfully set" build: needs: release_tag @@ -49,13 +48,13 @@ jobs: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_ACCESS_TOKEN }} - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + #- name: Set up QEMU + # uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 with: - endpoint: tcp://docker:2376 + endpoint: tcp://forgejo-docker-in-docker-1:2375 - name: Build and push uses: docker/build-push-action@v5 diff --git a/README.md b/README.md index 6b72fd5..778caa8 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ - [ownDynDNS-netcup](#owndyndns-netcup) - [acknowledgments](#acknowledgments) - - [Netcup configuration](#netcup-configuration) + - [Nectup configuration](#nectup-configuration) - [Container configuration](#container-configuration) - [Fritz!Box configuration](#fritzbox-configuration) @@ -12,7 +12,7 @@ This container is based on the work of: * [PHP](https://hub.docker.com/_/php) * [Fernwerker ownDynDNS](https://github.com/fernwerker/ownDynDNS) -## Netcup configuration +## Nectup configuration You need to create your dns entries beforehand: | Host | Type | Destination | diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile index d755c14..6076d05 100755 --- a/docker-build/Dockerfile +++ b/docker-build/Dockerfile @@ -7,7 +7,7 @@ RUN apk update && \ RUN git clone https://github.com/fernwerker/ownDynDNS.git # Build container to run the app -FROM php:8.3.8-apache +FROM php:8.3.7-apache WORKDIR /var/www/html RUN apt-get update -y && \