Skip to content

Commit

Permalink
Add modulesync to Container Image
Browse files Browse the repository at this point in the history
  • Loading branch information
bastelfreak committed Mar 13, 2024
1 parent 6b01bbe commit 6b6edc9
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build_container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobs:
RUBYGEM_PUPPET_METADATA=${{ matrix.rubygem_puppet_metadata }}
RUBYGEM_OVERCOMMIT=${{ matrix.rubygem_overcommit }}
RUBYGEM_PUPPET=${{ matrix.rubygem_puppet }}
RUBYGEM_MODULESYNC=${{ matrix.rubygem_modulesync }}
# we can not yet build arm containers as pdk and bolt are not available for arm
# build_arch: linux/amd64,linux/arm64
docker_username: ${{ vars.DOCKERHUB_USER }}
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ ENV RUBYGEM_OVERCOMMIT=${RUBYGEM_OVERCOMMIT:-0.63.0}
ARG RUBYGEM_PUPPET
ENV RUBYGEM_PUPPET=${RUBYGEM_PUPPET:-7.29.1}

ARG RUBYGEM_MODULESYNC
ENV RUBYGEM_PUPPET=${RUBYGEM_MODULESYNC:-3.2.0}

ENV DEBIAN_FRONTEND=noninteractive
ENV PUPPET_DEB=puppet${PUPPET_RELEASE}-release-${UBUNTU_CODENAME}.deb

Expand Down
6 changes: 4 additions & 2 deletions build_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"rubygem_voxpupuli_release": "3.0.1",
"rubygem_puppet_metadata": "3.6.0",
"rubygem_overcommit": "0.63.0",
"rubygem_puppet": "7.29.1"
"rubygem_puppet": "7.29.1",
"rubygem_modulesync": "3.2.0"
},
{
"puppet_release": 8,
Expand All @@ -28,7 +29,8 @@
"rubygem_voxpupuli_release": "3.0.1",
"rubygem_puppet_metadata": "3.6.0",
"rubygem_overcommit": "0.63.0",
"rubygem_puppet": "7.29.1"
"rubygem_puppet": "7.29.1",
"rubygem_modulesync": "3.2.0"
}
]
}
1 change: 1 addition & 0 deletions pdc/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ gem 'rake', :require => false
gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
gem 'puppet', ENV['RUBYGEM_PUPPET'], :require => false, :groups => [:test]

gem 'modulesync', ENV['RUBYGEM_MODULESYNC'],
# vim: syntax=ruby

0 comments on commit 6b6edc9

Please sign in to comment.