Skip to content

Commit ffc3f4d

Browse files
authored
Merge pull request #30 from betadots/also_push_to_dockerhub
Also push to dockerhub
2 parents 1da8d70 + d26709f commit ffc3f4d

File tree

3 files changed

+21
-7
lines changed

3 files changed

+21
-7
lines changed

.github/workflows/build_container.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,18 @@ jobs:
4242
PUPPETDB_TERMINI_VERSION=${{ matrix.puppetdb_termini_version }}
4343
# we can not yet build arm containers as pdk and bolt are not available for arm
4444
# build_arch: linux/amd64,linux/arm64
45+
docker_username: ${{ vars.DOCKERHUB_USER }}
46+
docker_password: ${{ secrets.DOCKERHUB_TOKEN }}
4547
tags: |
4648
ghcr.io/${{ github.repository }}:${{ github.ref_name }}-${{ matrix.puppet_release }}
4749
ghcr.io/${{ github.repository }}:latest-${{ matrix.puppet_release }}
4850
ghcr.io/${{ github.repository }}:latest
51+
docker.io/${{ github.repository }}:${{ github.ref_name }}-${{ matrix.puppet_release }}
52+
docker.io/${{ github.repository }}:latest-${{ matrix.puppet_release }}
53+
docker.io/${{ github.repository }}:latest
54+
55+
- name: Update Docker Hub Description
56+
uses: peter-evans/dockerhub-description@v3
57+
with:
58+
username: ${{ vars.DOCKERHUB_USER }}
59+
password: ${{ secrets.DOCKERHUB_TOKEN }}

README.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
# Puppet Development Container
22

3-
maintained by [betadots GmbH](https://www.betadots.de)
3+
[![Maintained by betadots GmbH](https://img.shields.io/badge/Maintained%20by-betadots%20GmbH-blue.svg)](https://www.betadots.de)
4+
[![QA🚦](https://github.com/betadots/pdc/actions/workflows/ci.yaml/badge.svg)](https://github.com/betadots/pdc/actions/workflows/ci.yaml)
5+
[![Build and publish a 🛢️ container](https://github.com/betadots/pdc/actions/workflows/build_container.yml/badge.svg)](https://github.com/betadots/pdc/actions/workflows/build_container.yml)
46

5-
This repository holds the code base for the Puppet Development Container (PDC).
7+
This repository contains the code for the betadots Puppet Development Container (PDC).
68

79
## Usage
810

911
```shell
10-
docker run -ti ghcr.io:betadots/pdc:latest bash
12+
docker run -ti --rm ghcr.io:betadots/pdc:latest bash
1113
```
1214

13-
Instead of running bash, one can mount the repo and execute a script.
15+
Rather than using bash directly, you have the option to mount the repository and run a script.
1416

17+
Included fixed software versions, see: [build_versions.json](build_versions.json)
1518

16-
included fixed software see: [build_versions.json](build_versions.json)
19+
For any given container tag you can lookup the specific versions here: `https://github.com/betadots/pdc/blob/$TAG/build_versions.json`

RELEASE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Create a Release PR.
44
The release branch has to have the version in the name, because this will be used as `future_version` of the github cnahgelog generator.
55

6-
```
6+
```shell
77
git switch main
88
git pull -r
99
git switch -c release-v1.0.0
@@ -20,7 +20,7 @@ git push origin release-v1.0.0
2020

2121
After the merge do:
2222

23-
```
23+
```shell
2424
git switch main
2525
git pull -r
2626
git tag v1.0.0

0 commit comments

Comments
 (0)