Skip to content

Commit fa3c82b

Browse files
Merge pull request #170 from devops-infra/feature/docker-descr
Add description in Docker Hub
2 parents ff118b4 + d4a443d commit fa3c82b

File tree

4 files changed

+21
-14
lines changed

4 files changed

+21
-14
lines changed

.github/workflows/PUSH-MASTER.yml

+9
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,12 @@ jobs:
6363
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6464
TERM: xterm-256color
6565
run: make push
66+
67+
- name: Docker Hub Description
68+
uses: peter-evans/[email protected]
69+
with:
70+
username: ${{ vars.DOCKER_USERNAME }}
71+
password: ${{ secrets.DOCKER_TOKEN }}
72+
repository: ${{ vars.DOCKER_ORG_NAME }}/${{ github.event.repository.name }}
73+
short-description: ${{ github.event.repository.description }}
74+
image-extensions: png

.github/workflows/PUSH-OTHER.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868

6969
pull_request:
7070
name: Create Pull Request
71-
runs-on: ubuntu-24.04
71+
runs-on: ubuntu-24.04-arm
7272
steps:
7373
- name: Checkout
7474
uses: actions/checkout@v4
@@ -83,7 +83,7 @@ jobs:
8383
8484
- name: PR - bugfix (conditional)
8585
if: startsWith(github.ref, 'refs/heads/bug')
86-
uses: devops-infra/action-pull-request@v0.5.5
86+
uses: devops-infra/action-pull-request@v0.6.0
8787
with:
8888
github_token: ${{ secrets.GITHUB_TOKEN }}
8989
assignee: ${{ github.actor }}
@@ -93,7 +93,7 @@ jobs:
9393

9494
- name: PR - dependency (conditional)
9595
if: "startsWith(github.ref, 'refs/heads/dep') && !startsWith(github.ref, 'refs/heads/dependabot')"
96-
uses: devops-infra/action-pull-request@v0.5.5
96+
uses: devops-infra/action-pull-request@v0.6.0
9797
with:
9898
github_token: ${{ secrets.GITHUB_TOKEN }}
9999
assignee: ${{ github.actor }}
@@ -103,7 +103,7 @@ jobs:
103103

104104
- name: PR - documentation (conditional)
105105
if: startsWith(github.ref, 'refs/heads/doc')
106-
uses: devops-infra/action-pull-request@v0.5.5
106+
uses: devops-infra/action-pull-request@v0.6.0
107107
with:
108108
github_token: ${{ secrets.GITHUB_TOKEN }}
109109
assignee: ${{ github.actor }}
@@ -113,7 +113,7 @@ jobs:
113113

114114
- name: PR - feature (conditional)
115115
if: startsWith(github.ref, 'refs/heads/feat')
116-
uses: devops-infra/action-pull-request@v0.5.5
116+
uses: devops-infra/action-pull-request@v0.6.0
117117
with:
118118
github_token: ${{ secrets.GITHUB_TOKEN }}
119119
assignee: ${{ github.actor }}
@@ -123,7 +123,7 @@ jobs:
123123

124124
- name: PR - test (conditional)
125125
if: startsWith(github.ref, 'refs/heads/test')
126-
uses: devops-infra/action-pull-request@v0.5.5
126+
uses: devops-infra/action-pull-request@v0.6.0
127127
with:
128128
github_token: ${{ secrets.GITHUB_TOKEN }}
129129
assignee: ${{ github.actor }}
@@ -135,7 +135,7 @@ jobs:
135135

136136
- name: PR - test (conditional)
137137
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')"
138-
uses: devops-infra/action-pull-request@v0.5.5
138+
uses: devops-infra/action-pull-request@v0.6.0
139139
with:
140140
github_token: ${{ secrets.GITHUB_TOKEN }}
141141
assignee: ${{ github.actor }}

Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ VERSION_PREFIX ?=
1212
# Other variables and constants
1313
CURRENT_BRANCH := $(shell echo $(GITHUB_REF) | sed 's/refs\/heads\///')
1414
GITHUB_SHORT_SHA := $(shell echo $(GITHUB_SHA) | cut -c1-7)
15-
DOCKER_USER_ID := christophshyper
15+
DOCKER_USERNAME := christophshyper
1616
DOCKER_ORG_NAME := devopsinfra
1717
DOCKER_IMAGE := action-pull-request
1818
DOCKER_NAME := $(DOCKER_ORG_NAME)/$(DOCKER_IMAGE)
19-
GITHUB_USER_ID := ChristophShyper
19+
GITHUB_USERNAME := ChristophShyper
2020
GITHUB_ORG_NAME := devops-infra
2121
GITHUB_NAME := ghcr.io/$(GITHUB_ORG_NAME)/$(DOCKER_IMAGE)
2222
BUILD_DATE := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
@@ -71,9 +71,9 @@ build: ## Build Docker images
7171
.PHONY: login
7272
login: ## Log into all registries
7373
@echo -e "\n$(TXT_GREEN)Logging to: $(TXT_YELLOW)Docker Hub$(TXT_RESET)"
74-
@echo $(DOCKER_TOKEN) | docker login -u $(DOCKER_USER_ID) --password-stdin
74+
@echo $(DOCKER_TOKEN) | docker login -u $(DOCKER_USERNAME) --password-stdin
7575
@echo -e "\n$(TXT_GREEN)Logging to: $(TXT_YELLOW)GitHub Packages$(TXT_RESET)"
76-
@echo $(GITHUB_TOKEN) | docker login ghcr.io -u $(GITHUB_USER_ID) --password-stdin
76+
@echo $(GITHUB_TOKEN) | docker login ghcr.io -u $(GITHUB_USERNAME) --password-stdin
7777

7878

7979
.PHONY: push

README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# GitHub Action for creating Pull Requests
2-
3-
## GitHub Action that will create a pull request from the current branch.
1+
# GitHub Action for creating Pull Requests in a repository
42

53
### Supporting `amd64` and `aarch64/arm64` images!
64

0 commit comments

Comments
 (0)