From 2408a0f40c96a4a3c10727bb5e39b87bd2dfbb2f Mon Sep 17 00:00:00 2001 From: Martin Alfke Date: Tue, 2 Jan 2024 12:05:44 +0100 Subject: [PATCH 1/4] use new version schema --- .github/workflows/build_docker.yml | 4 ++-- README.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml index b564ac67..abb94527 100644 --- a/.github/workflows/build_docker.yml +++ b/.github/workflows/build_docker.yml @@ -42,9 +42,9 @@ jobs: build_context: puppetserver buildfile: puppetserver/Dockerfile tags: | - ghcr.io/${{ github.repository }}:${{ github.ref_name }}-${{ matrix.release }} + ghcr.io/${{ github.repository }}:${{ matrix.version }}-${{ github.ref_name }} ghcr.io/${{ github.repository }}:latest - docker.io/${{ github.repository }}:${{ github.ref_name }}-${{ matrix.release }} + docker.io/${{ github.repository }}:${ matrix.versoin }}-${{ github.ref_name }} docker.io/${{ github.repository }}:latest - name: Update Docker Hub Description diff --git a/README.md b/README.md index e54a585b..335eb135 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ This project hosts the Dockerfile and the required scripts to build a Puppet Ser You can run a copy of Puppet Server with the following Docker command: ```bash -docker run --name puppet --hostname puppet ghcr.io/voxpupuli/container-puppetserver:v1.0.0-7 +docker run --name puppet --hostname puppet ghcr.io/voxpupuli/container-puppetserver:7.13.0-v1.1.0 ``` Although it is not strictly necessary to name the container `puppet`, this is @@ -30,7 +30,7 @@ on that hostname by default. If you would like to start the Puppet Server with your own Puppet code, you can mount your own directory at `/etc/puppetlabs/code`: - docker run --name puppet --hostname puppet -v ./code:/etc/puppetlabs/code/ ghcr.io/voxpupuli/container-puppetserver:v1.0.0-7 + docker run --name puppet --hostname puppet -v ./code:/etc/puppetlabs/code/ ghcr.io/voxpupuli/container-puppetserver:7.13.0-v1.1.0 For compose file see: [CRAFTY](https://github.com/voxpupuli/crafty/tree/main/puppet/oss) @@ -76,7 +76,7 @@ These scripts will be executed at the end of the entrypoint script, before the s If you plan to use the in-server CA, restarting the container can cause the server's keys and certificates to change, causing agents and the server to stop trusting each other. To prevent this, you can persist the default cadir, `/etc/puppetlabs/puppetserver/ca`. -For example, `docker run -v $PWD/ca-ssl:/etc/puppetlabs/puppetserver/ca ghcr.io/voxpupuli/container-puppetserver:v1.0.0-7`. +For example, `docker run -v $PWD/ca-ssl:/etc/puppetlabs/puppetserver/ca ghcr.io/voxpupuli/container-puppetserver:7.13.0-v1.1.0`. ## How to Release the container From 16f56a52a172d70a9b56e25007a4271285bd9d5d Mon Sep 17 00:00:00 2001 From: Martin Alfke Date: Wed, 3 Jan 2024 16:18:55 +0100 Subject: [PATCH 2/4] adopt version string in docker build --- .github/workflows/build_docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml index abb94527..43e69a6b 100644 --- a/.github/workflows/build_docker.yml +++ b/.github/workflows/build_docker.yml @@ -42,9 +42,9 @@ jobs: build_context: puppetserver buildfile: puppetserver/Dockerfile tags: | - ghcr.io/${{ github.repository }}:${{ matrix.version }}-${{ github.ref_name }} + ghcr.io/${{ github.repository }}:v${{ matrix.version }}-${{ github.ref_name }} ghcr.io/${{ github.repository }}:latest - docker.io/${{ github.repository }}:${ matrix.versoin }}-${{ github.ref_name }} + docker.io/${{ github.repository }}:v${ matrix.version }}-${{ github.ref_name }} docker.io/${{ github.repository }}:latest - name: Update Docker Hub Description From f4fbd2442d1bf17bd29c98dcf51b3ff1745a8f14 Mon Sep 17 00:00:00 2001 From: Martin Alfke Date: Wed, 3 Jan 2024 16:26:33 +0100 Subject: [PATCH 3/4] adopt version string in docker build --- .github/workflows/build_docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml index 43e69a6b..bd8dbd08 100644 --- a/.github/workflows/build_docker.yml +++ b/.github/workflows/build_docker.yml @@ -42,9 +42,9 @@ jobs: build_context: puppetserver buildfile: puppetserver/Dockerfile tags: | - ghcr.io/${{ github.repository }}:v${{ matrix.version }}-${{ github.ref_name }} + ghcr.io/${{ github.repository }}:${{ matrix.version }}-${{ github.ref_name }} ghcr.io/${{ github.repository }}:latest - docker.io/${{ github.repository }}:v${ matrix.version }}-${{ github.ref_name }} + docker.io/${{ github.repository }}:${ matrix.version }}-${{ github.ref_name }} docker.io/${{ github.repository }}:latest - name: Update Docker Hub Description From b0d5aebb3e8a3919eafd9cd496465434794e8a0d Mon Sep 17 00:00:00 2001 From: Martin Alfke Date: Wed, 3 Jan 2024 16:27:47 +0100 Subject: [PATCH 4/4] adopt version string in docker build --- .github/workflows/build_docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml index bd8dbd08..f4241ac8 100644 --- a/.github/workflows/build_docker.yml +++ b/.github/workflows/build_docker.yml @@ -44,7 +44,7 @@ jobs: tags: | ghcr.io/${{ github.repository }}:${{ matrix.version }}-${{ github.ref_name }} ghcr.io/${{ github.repository }}:latest - docker.io/${{ github.repository }}:${ matrix.version }}-${{ github.ref_name }} + docker.io/${{ github.repository }}:${{ matrix.version }}-${{ github.ref_name }} docker.io/${{ github.repository }}:latest - name: Update Docker Hub Description