From d4a443d6e91a76b65e1709650358d82c9cd44669 Mon Sep 17 00:00:00 2001 From: ChristophShyper <45788587+ChristophShyper@users.noreply.github.com> Date: Wed, 12 Feb 2025 12:57:48 +0100 Subject: [PATCH] Add description in Docker Hub --- .github/workflows/PUSH-MASTER.yml | 9 +++++++++ .github/workflows/PUSH-OTHER.yml | 14 +++++++------- Makefile | 8 ++++---- README.md | 4 +--- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.github/workflows/PUSH-MASTER.yml b/.github/workflows/PUSH-MASTER.yml index 0c13ccc..9990a22 100644 --- a/.github/workflows/PUSH-MASTER.yml +++ b/.github/workflows/PUSH-MASTER.yml @@ -63,3 +63,12 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TERM: xterm-256color run: make push + + - name: Docker Hub Description + uses: peter-evans/dockerhub-description@v4.0.0 + with: + username: ${{ vars.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_TOKEN }} + repository: ${{ vars.DOCKER_ORG_NAME }}/${{ github.event.repository.name }} + short-description: ${{ github.event.repository.description }} + image-extensions: png diff --git a/.github/workflows/PUSH-OTHER.yml b/.github/workflows/PUSH-OTHER.yml index f74b5e8..6802e3b 100644 --- a/.github/workflows/PUSH-OTHER.yml +++ b/.github/workflows/PUSH-OTHER.yml @@ -68,7 +68,7 @@ jobs: pull_request: name: Create Pull Request - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm steps: - name: Checkout uses: actions/checkout@v4 @@ -83,7 +83,7 @@ jobs: - name: PR - bugfix (conditional) if: startsWith(github.ref, 'refs/heads/bug') - uses: devops-infra/action-pull-request@v0.5.5 + uses: devops-infra/action-pull-request@v0.6.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} assignee: ${{ github.actor }} @@ -93,7 +93,7 @@ jobs: - name: PR - dependency (conditional) if: "startsWith(github.ref, 'refs/heads/dep') && !startsWith(github.ref, 'refs/heads/dependabot')" - uses: devops-infra/action-pull-request@v0.5.5 + uses: devops-infra/action-pull-request@v0.6.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} assignee: ${{ github.actor }} @@ -103,7 +103,7 @@ jobs: - name: PR - documentation (conditional) if: startsWith(github.ref, 'refs/heads/doc') - uses: devops-infra/action-pull-request@v0.5.5 + uses: devops-infra/action-pull-request@v0.6.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} assignee: ${{ github.actor }} @@ -113,7 +113,7 @@ jobs: - name: PR - feature (conditional) if: startsWith(github.ref, 'refs/heads/feat') - uses: devops-infra/action-pull-request@v0.5.5 + uses: devops-infra/action-pull-request@v0.6.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} assignee: ${{ github.actor }} @@ -123,7 +123,7 @@ jobs: - name: PR - test (conditional) if: startsWith(github.ref, 'refs/heads/test') - uses: devops-infra/action-pull-request@v0.5.5 + uses: devops-infra/action-pull-request@v0.6.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} assignee: ${{ github.actor }} @@ -135,7 +135,7 @@ jobs: - name: PR - test (conditional) if: "!startsWith(github.ref, 'refs/heads/bug') && !startsWith(github.ref, 'refs/heads/dep') && !startsWith(github.ref, 'refs/heads/doc') && !startsWith(github.ref, 'refs/heads/feat') && !startsWith(github.ref, 'refs/heads/test')" - uses: devops-infra/action-pull-request@v0.5.5 + uses: devops-infra/action-pull-request@v0.6.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} assignee: ${{ github.actor }} diff --git a/Makefile b/Makefile index 7aef8ab..caf4df4 100644 --- a/Makefile +++ b/Makefile @@ -12,11 +12,11 @@ VERSION_PREFIX ?= # Other variables and constants CURRENT_BRANCH := $(shell echo $(GITHUB_REF) | sed 's/refs\/heads\///') GITHUB_SHORT_SHA := $(shell echo $(GITHUB_SHA) | cut -c1-7) -DOCKER_USER_ID := christophshyper +DOCKER_USERNAME := christophshyper DOCKER_ORG_NAME := devopsinfra DOCKER_IMAGE := action-pull-request DOCKER_NAME := $(DOCKER_ORG_NAME)/$(DOCKER_IMAGE) -GITHUB_USER_ID := ChristophShyper +GITHUB_USERNAME := ChristophShyper GITHUB_ORG_NAME := devops-infra GITHUB_NAME := ghcr.io/$(GITHUB_ORG_NAME)/$(DOCKER_IMAGE) BUILD_DATE := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ") @@ -71,9 +71,9 @@ build: ## Build Docker images .PHONY: login login: ## Log into all registries @echo -e "\n$(TXT_GREEN)Logging to: $(TXT_YELLOW)Docker Hub$(TXT_RESET)" - @echo $(DOCKER_TOKEN) | docker login -u $(DOCKER_USER_ID) --password-stdin + @echo $(DOCKER_TOKEN) | docker login -u $(DOCKER_USERNAME) --password-stdin @echo -e "\n$(TXT_GREEN)Logging to: $(TXT_YELLOW)GitHub Packages$(TXT_RESET)" - @echo $(GITHUB_TOKEN) | docker login ghcr.io -u $(GITHUB_USER_ID) --password-stdin + @echo $(GITHUB_TOKEN) | docker login ghcr.io -u $(GITHUB_USERNAME) --password-stdin .PHONY: push diff --git a/README.md b/README.md index 12316ca..05fce36 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ -# GitHub Action for creating Pull Requests - -## GitHub Action that will create a pull request from the current branch. +# GitHub Action for creating Pull Requests in a repository ### Supporting `amd64` and `aarch64/arm64` images!