Skip to content

Commit

Permalink
Merge pull request #28 from betadots/update_pdk
Browse files Browse the repository at this point in the history
update pdk version and Gemfile
  • Loading branch information
tuxmea committed Jan 5, 2024
2 parents b66437f + b80de83 commit 1da8d70
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build_container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ jobs:
PDK_VERSION=${{ matrix.pdk_version }}
BOLT_VERSION=${{ matrix.bolt_version }}
PUPPETDB_TERMINI_VERSION=${{ matrix.puppetdb_termini_version }}
# we can not yet build arm containers as pdk and bolt are not available for arm
# 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 }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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 \
Expand Down
8 changes: 6 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions build_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
"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"
},
{
"puppet_release": 8,
"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"
}
]
Expand Down

0 comments on commit 1da8d70

Please sign in to comment.