diff --git a/.github/config.yml b/.github/config.yml new file mode 100644 index 0000000..3ba13e0 --- /dev/null +++ b/.github/config.yml @@ -0,0 +1 @@ +blank_issues_enabled: false diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..2c7d170 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,7 @@ +version: 2 +updates: + # Maintain dependencies for GitHub Actions + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b055313..ae5ad35 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Prepare id: prep @@ -63,17 +63,17 @@ jobs: echo ::set-output name=docker_image::${DOCKER_IMAGE} - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v2 with: platforms: all - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to DockerHub if: github.event_name != 'pull_request' - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} @@ -101,11 +101,11 @@ jobs: fi - name: Build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: builder: ${{ steps.buildx.outputs.name }} context: . file: ./Dockerfile - platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 + platforms: linux/amd64,linux/arm/v7,linux/arm64 push: true tags: ${{ steps.prep.outputs.tags }} diff --git a/CHANGELOG.md b/CHANGELOG.md index c5bdd39..05e615a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 4.1.3 2022-05-24 + + ### Added + - Alpine 3.16 base + + ## 4.1.2 2021-11-24 ### Added diff --git a/Dockerfile b/Dockerfile index 1a83480..abec635 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,11 @@ -FROM docker.io/tiredofit/alpine:3.15 +FROM docker.io/tiredofit/alpine:3.16 LABEL maintainer="Dave Conroy (github.com/tiredofit)" ### Set Environment Variables -ENV ENABLE_CRON=false \ - CONTAINER_ENABLE_MESSAGING=FALSE +ENV ENABLE_CRON=FALSE \ + CONTAINER_ENABLE_MESSAGING=FALSE \ + IMAGE_NAME="tiredofit/nginx-proxy-cloudflare-companion" \ + IMAGE_REPO_URL="https://github.com/tiredofit/docker-nginx-proxy-cloudflare-companion/" ### Dependencies RUN set -x && \ diff --git a/install/etc/cont-init.d/10-cloudflare-companion b/install/etc/cont-init.d/10-cloudflare-companion index cbebb29..e9f66ff 100755 --- a/install/etc/cont-init.d/10-cloudflare-companion +++ b/install/etc/cont-init.d/10-cloudflare-companion @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/command/with-contenv bash source /assets/functions/00-container prepare_service single diff --git a/install/etc/services.available/10-cloudflare-companion/run b/install/etc/services.available/10-cloudflare-companion/run index c4c4856..34745bd 100755 --- a/install/etc/services.available/10-cloudflare-companion/run +++ b/install/etc/services.available/10-cloudflare-companion/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/command/with-contenv bash source /assets/functions/00-container PROCESS_NAME="nginx-proxy-cloudflare-companion"