From a3bb1186492f8e19cad99c44b451f16cde7381e9 Mon Sep 17 00:00:00 2001 From: Moritz Schlarb Date: Sat, 7 Oct 2023 16:31:05 +0200 Subject: [PATCH 1/2] Rename image to containrrr/shepherd in docs --- CHANGELOG.md | 21 +++++++++++++++++++++ README.md | 12 ++++++------ docker-compose.yml | 2 +- manifest.tmpl | 8 ++++---- 4 files changed, 32 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92dcf30..d752c6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +## [1.8.0](https://github.com/containrrr/shepherd/tree/1.8.0) (UNRELEASED) + +[Full Changelog](https://github.com/containrrr/shepherd/compare/0.7.0...1.8.0) + +**Breaking changes:** + +- The docker image registry location has been changed to the containrrr organisation: + `containrrr/shepherd` + +**Implemented enhancements:** + +- + +**Fixed bugs:** + +- + +**Closed issues:** + +- + ## [0.7.0](https://github.com/djmaze/shepherd/tree/0.7.0) (2022-10-03) [Full Changelog](https://github.com/djmaze/shepherd/compare/0.6.0...0.7.0) diff --git a/README.md b/README.md index bc3af8a..05794c9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Shepherd -[![Build Status](https://ci.strahlungsfrei.de/api/badges/djmaze/shepherd/status.svg)](https://ci.strahlungsfrei.de/djmaze/shepherd) -[![Docker Stars](https://img.shields.io/docker/stars/mazzolino/shepherd.svg)](https://hub.docker.com/r/mazzolino/shepherd/) [![Docker Pulls](https://img.shields.io/docker/pulls/mazzolino/shepherd.svg)](https://hub.docker.com/r/mazzolino/shepherd/) +[![Build](https://github.com/containrrr/shepherd/actions/workflows/build.yml/badge.svg)](https://github.com/containrrr/shepherd/actions/workflows/build.yml) +[![Docker Stars](https://img.shields.io/docker/stars/containrrr/shepherd.svg)](https://hub.docker.com/r/containrrr/shepherd/) [![Docker Pulls](https://img.shields.io/docker/pulls/containrrr/shepherd.svg)](https://hub.docker.com/r/containrrr/shepherd/) A Docker swarm service for automatically updating your services whenever their base image is refreshed. @@ -10,7 +10,7 @@ A Docker swarm service for automatically updating your services whenever their b docker service create --name shepherd \ --constraint "node.role==manager" \ --mount type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock,ro \ - mazzolino/shepherd + containrrr/shepherd ### Or with Docker Compose @@ -19,7 +19,7 @@ A Docker swarm service for automatically updating your services whenever their b ... shepherd: build: . - image: mazzolino/shepherd + image: containrrr/shepherd volumes: - /var/run/docker.sock:/var/run/docker.sock deploy: @@ -65,7 +65,7 @@ You need to make the secret available to shepherd with the `secrets` key, and pa ``` services: app: - image: mazzolino/shepherd + image: containrrr/shepherd environment: REGISTRIES_FILE: /var/run/secrets/shepherd-registries-auth secrets: @@ -113,7 +113,7 @@ Example: --env TZ=Europe/Berlin \ --mount type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock,ro \ --mount type=bind,source=/root/.docker/config.json,target=/root/.docker/config.json,ro \ - mazzolino/shepherd + containrrr/shepherd ## Running on a cron schedule diff --git a/docker-compose.yml b/docker-compose.yml index 1dfb6cb..33f068d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: "3" services: app: build: . - image: mazzolino/shepherd + image: containrrr/shepherd environment: TZ: 'US/Eastern' SLEEP_TIME: '5m' diff --git a/manifest.tmpl b/manifest.tmpl index fc8f516..09234c5 100644 --- a/manifest.tmpl +++ b/manifest.tmpl @@ -1,4 +1,4 @@ -image: mazzolino/shepherd:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} +image: containrrr/shepherd:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} {{#if build.tags}} tags: {{#each build.tags}} @@ -7,17 +7,17 @@ tags: {{/if}} manifests: - - image: mazzolino/shepherd:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}amd64 + image: containrrr/shepherd:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}amd64 platform: architecture: amd64 os: linux - - image: mazzolino/shepherd:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm + image: containrrr/shepherd:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm platform: architecture: arm os: linux - - image: mazzolino/shepherd:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm64 + image: containrrr/shepherd:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm64 platform: architecture: arm64 os: linux From af4807e5e8519037657c61c061fd48a22cea419e Mon Sep 17 00:00:00 2001 From: Moritz Schlarb Date: Sat, 7 Oct 2023 14:37:46 +0000 Subject: [PATCH 2/2] Add action to sync docker hub description from README.md --- .github/workflows/release.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index da4de38..ddb1c3d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -75,6 +75,14 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max + # Update Docker Hub repository description from README.md + # https://github.com/peter-evans/dockerhub-description + - name: Update docker hub description + uses: peter-evans/dockerhub-description@v3.4.2 + with: + username: ${{ secrets.DOCKER_USER }} + password: ${{ secrets.DOCKER_PASSWORD }} + # https://github.com/sigstore/cosign - name: Sign the published Docker image # This step uses the identity token to provision an ephemeral certificate