From 89d8c926056cd9fb684666026a8a7f48df4f4b38 Mon Sep 17 00:00:00 2001
From: Martin Alfke <ma@betadots.de>
Date: Fri, 5 Jan 2024 10:34:27 +0100
Subject: [PATCH] updates

- also build arm container
- update pdk
- prepare new gems in gemfile (not yet used)
- add some minor documentation on usage
---
 .github/workflows/build_container.yml |  1 +
 Dockerfile                            |  4 ++--
 Gemfile                               |  8 ++++++--
 README.md                             | 13 +++++++++++++
 build_versions.json                   |  4 ++--
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml
index 47b563e..4bd984c 100644
--- a/.github/workflows/build_container.yml
+++ b/.github/workflows/build_container.yml
@@ -40,6 +40,7 @@ jobs:
             PDK_VERSION=${{ matrix.pdk_version }}
             BOLT_VERSION=${{ matrix.bolt_version }}
             PUPPETDB_TERMINI_VERSION=${{ matrix.puppetdb_termini_version }}
+          build_arch: linux/amd64,linux/arm64
           tags: |
             ghcr.io/${{ github.repository }}:${{ github.ref_name }}-${{ matrix.puppet_release }}
             ghcr.io/${{ github.repository }}:latest-${{ matrix.puppet_release }}
diff --git a/Dockerfile b/Dockerfile
index 097d48e..9c4b363 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@ ARG TERRAFORM_VERSION
 ENV TERRAFORM_VERSION=${TERRAFORM_VERSION:-1.6.2}
 
 ARG PDK_VERSION
-ENV PDK_VERSION=${PDK_VERSION:-3.0.0.0}
+ENV PDK_VERSION=${PDK_VERSION:-3.0.1.3}
 
 ARG BOLT_VERSION
 ENV BOLT_VERSION=${BOLT_VERSION:-3.27.4}
@@ -42,7 +42,7 @@ ADD https://apt.puppet.com/${PUPPET_DEB} /${PUPPET_DEB}
 RUN apt install /${PUPPET_DEB} \
     && rm -f /${PUPPET_DEB}
 
-RUN apt update && apt install -y --no-install-recommends \
+RUN apt update && apt upgrade -y && apt install -y --no-install-recommends \
     ca-certificates \
     cmake \
     curl \
diff --git a/Gemfile b/Gemfile
index d861874..6477f18 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,14 +1,18 @@
 source 'https://rubygems.org'
 
 gem 'hiera-eyaml',                   '~> 3.3'
-gem 'onceover',                      '~> 3.20'
-gem 'onceover-codequality',          '~> 0.10'
+gem 'onceover',                      '~> 3.21'
+gem 'onceover-codequality',          '~> 0.11'
 gem 'onceover-lookup',               '~> 0.1', '>= 0.1.1'
 gem 'onceover-octocatalog-diff',     '~> 0.1', '>= 0.1.8'
 gem 'r10k',                          '~> 4.0'
 gem 'ra10ke',                        '~> 3.0'
 gem 'voxpupuli-acceptance',          '~> 3.0'
 gem 'voxpupuli-test',                '~> 7.0'
+gem 'toml-rb',                       '~> 2.2'
+gem 'rubocop',                       '~> 1.59'
+gem 'rubocop-performance',           '~> 1.20'
+gem 'rubocop-rspec',                 '~> 2.26'
 
 group :release do
   gem 'github_changelog_generator', '~> 1.16.4', require: false
diff --git a/README.md b/README.md
index 2e75c1a..23887be 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,16 @@
 # Puppet Development Container
 
+maintained by [betadots GmbH](https://www.betadots.de)
+
+This repository holds the code base for the Puppet Development Container (PDC).
+
+## Usage
+
+```shell
+docker run -ti ghcr.io:betadots/pdc:latest bash
+```
+
+Instead of running bash, one can mount the repo and execute a script.
+
+
 included fixed software see: [build_versions.json](build_versions.json)
diff --git a/build_versions.json b/build_versions.json
index 74c624e..10f8a59 100644
--- a/build_versions.json
+++ b/build_versions.json
@@ -5,7 +5,7 @@
       "puppet_version": "7.27.0",
       "puppetdb_termini_version": "7.15.0",
       "terraform_version": "1.6.2",
-      "pdk_version": "3.0.0.0",
+      "pdk_version": "3.0.1.3",
       "bolt_version": "3.27.4"
     },
     {
@@ -13,7 +13,7 @@
       "puppet_version": "8.3.1",
       "puppetdb_termini_version": "8.2.0",
       "terraform_version": "1.6.2",
-      "pdk_version": "3.0.0.0",
+      "pdk_version": "3.0.1.3",
       "bolt_version": "3.27.4"
     }
   ]