diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 226d33b..0000000 --- a/.drone.yml +++ /dev/null @@ -1,116 +0,0 @@ -kind: pipeline -type: docker -name: linux-amd64 - -platform: - os: linux - arch: amd64 - -steps: - - name: docker - image: plugins/docker - settings: - auto_tag: true - auto_tag_suffix: linux-amd64 - repo: samuelph/connectivity-check - username: - from_secret: USERNAME - password: - from_secret: PASSWORD - -trigger: - branch: - - master - event: - - push - ---- -kind: pipeline -type: docker -name: linux-arm64 - -platform: - os: linux - arch: arm64 - -steps: - - name: docker - image: plugins/docker - settings: - auto_tag: true - auto_tag_suffix: linux-arm64 - repo: samuelph/connectivity-check - username: - from_secret: USERNAME - password: - from_secret: PASSWORD - -trigger: - branch: - - master - event: - - push - ---- -kind: pipeline -type: docker -name: linux-arm - -platform: - os: linux - arch: arm - -steps: - - name: docker - image: plugins/docker - settings: - auto_tag: true - auto_tag_suffix: linux-arm - repo: samuelph/connectivity-check - username: - from_secret: USERNAME - password: - from_secret: PASSWORD - -trigger: - branch: - - master - event: - - push - ---- -kind: pipeline -type: docker -name: manifest - -platform: - os: linux - arch: arm64 - -steps: - - name: publish - image: plugins/manifest - settings: - auto_tag: true - ignore_missing: true - target: samuelph/connectivity-check - template: samuelph/connectivity-check:OS-ARCH - platforms: - - linux/amd64 - - linux/arm64 - - linux/arm - username: - from_secret: USERNAME - password: - from_secret: PASSWORD - -depends_on: - - linux-amd64 - - linux-arm64 - - linux-arm - -trigger: - branch: - - master - event: - - push diff --git a/.forgejo/workflows/docker.yml b/.forgejo/workflows/docker.yml new file mode 100644 index 0000000..b484a1f --- /dev/null +++ b/.forgejo/workflows/docker.yml @@ -0,0 +1,30 @@ +name: Build and Push Docker image + +on: + push: + branches: + - main + +jobs: + docker: + name: Build and Push Docker image + runs-on: docker + steps: + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Login to cr.sp-codes.de + uses: docker/login-action@v3 + with: + registry: cr.sp-codes.de + username: ${{ secrets.CR_USERNAME }} + password: ${{ secrets.CR_TOKEN }} + - name: Build and push + uses: docker/build-push-action@v6 + with: + push: true + tags: | + spcodes/connectivity-check:latest + cr.sp-codes.de/sp-codes/connectivity-check:latest diff --git a/Dockerfile b/Dockerfile index 8012015..0dcc399 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM nginx:1.19.9-alpine +FROM nginx:1.29.0-alpine@sha256:b2e814d28359e77bd0aa5fed1939620075e4ffa0eb20423cc557b375bd5c14ad COPY nginx.conf /etc/nginx/nginx.conf diff --git a/README.md b/README.md index 371d0e1..99de91c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# [connectivity-check](https://git.sp-codes.de/samuel-p/connectivity-check) +# [connectivity-check](https://git.sp-codes.de/sp-codes/connectivity-check) -[![Build Status](https://ci.sp-codes.de/api/badges/samuel-p/connectivity-check/status.svg)](https://ci.sp-codes.de/samuel-p/connectivity-check) [![License](https://img.shields.io/badge/license-MIT-orange)](#license) [![Docker Pulls](https://img.shields.io/docker/pulls/samuelph/connectivity-check)](https://hub.docker.com/r/samuelph/connectivity-check) +[![Build Status](https://ci.sp-codes.de/api/badges/sp-codes/connectivity-check/status.svg)](https://ci.sp-codes.de/sp-codes/connectivity-check) [![License](https://img.shields.io/badge/license-MIT-orange)](#license) [![Docker Pulls](https://img.shields.io/docker/pulls/spcodes/connectivity-check)](https://hub.docker.com/r/spcodes/connectivity-check) A self-hosted captive portal connectivity check. @@ -9,7 +9,7 @@ A self-hosted captive portal connectivity check. Just run the following command: ```bash -docker run -d -p 80:80 -p 443:443 samuelph/connectivity-check +docker run -d -p 80:80 -p 443:443 spcodes/connectivity-check ``` Or with docker-compose: @@ -19,7 +19,7 @@ version: '3.4' services: connectivitycheck: - image: samuelph/connectivity-check + image: spcodes/connectivity-check restart: always ports: - 80:80 diff --git a/renovate.json b/renovate.json index 7e23eca..6c72aec 100644 --- a/renovate.json +++ b/renovate.json @@ -1,9 +1,21 @@ { + "$schema": "https://docs.renovatebot.com/renovate-schema.json", "assignees": [ "samuel-p" ], "baseBranches": [ - "master" + "main" ], - "rangeStrategy": "bump" + "rangeStrategy": "bump", + "rebaseWhen": "behind-base-branch", + "automergeType": "branch", + "ignoreTests": true, + "packageRules": [ + { + "datasources": [ + "docker" + ], + "automerge": true + } + ] }