Skip to content

Commit

Permalink
Upgrade container with the following:
Browse files Browse the repository at this point in the history
- Set source image to the-works-buildenv:2.0.1
- Switched Base OS to RockyLinux (9) (Inherited from 'the-works-buildenv')
- Upgraded to PDK 2.7.1.0
- Locked gem dependency versions for various gem packages
- Use Shine fork of 3fs-phantomjs puppet module
  • Loading branch information
ovlords committed May 3, 2024
1 parent 70b7786 commit f4e2d4c
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 7 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased
### Changed
- Set source image to the-works-buildenv:2.0.1
- Switched Base OS to RockyLinux (9) (inherited from 'the-works-buildenv')
- Upgraded to PDK 2.7.1.0
- Locked gem dependency versions for various gem packages
- Use Shine fork of 3fs-phantomjs puppet module

## 3.2.0 - 2022-09-01
### Changed
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ lint:
provisioners/*.sh

build-docker-base:
scripts/run-playbook-stack.sh build "${config_path}" base
PACKER_TMP_DIR=/tmp scripts/run-playbook-stack.sh build "${config_path}" base

publish-docker-base:
scripts/run-playbook-stack.sh publish "${config_path}" base
Expand Down
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
forge 'https://forgeapi.puppetlabs.com'

mod '3fs-phantomjs', '1.0.0'
mod '3fs-phantomjs', :git => 'https://github.com/shinesolutions/puppet-phantomjs', :commit => 'b54ac53d64790fd891d47407e66b65ebc1ba994f'
mod 'puppetlabs/stdlib', '4.21.0'
20 changes: 18 additions & 2 deletions provisioners/aem-platform-buildenv.pp
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@
ensure => '2.5.2',
provider => 'puppet_gem',
}
package { 'faraday-net_http':
ensure => '3.0.2',
provider => 'puppet_gem',
}
package { 'faraday':
ensure => '2.8.1',
provider => 'puppet_gem',
}
package { 'r10k':
ensure => '3.15.1',
provider => 'puppet_gem',
Expand All @@ -70,17 +78,25 @@
provider => 'puppet_gem',
}
package { 'ruby_aem':
ensure => '3.13.1',
ensure => '3.16.1',
provider => 'puppet_gem',
}
package { 'ruby_aem_aws':
ensure => '2.2.1',
ensure => '3.0.0',
provider => 'puppet_gem',
}
package { 'nori':
ensure => '2.6.0',
provider => 'puppet_gem',
}
package { 'inspec':
ensure => '1.51.6',
provider => 'puppet_gem',
}
package { 'nokogiri':
ensure => '1.15.6',
provider => 'puppet_gem',
}
package { 'capybara':
ensure => '3.30.0',
provider => 'puppet_gem',
Expand Down
4 changes: 2 additions & 2 deletions provisioners/puppet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PUPPET_PATCH_VERSION=0
PUPPET_AGENT_VERSION="${PUPPET_MAJOR_VERSION}.${PUPPET_MINOR_VERSION}.${PUPPET_PATCH_VERSION}"
ARCH_TYPE=x86_64
OS_TYPE=el
OS_VERSION=7
OS_VERSION=9

if [[ "$(/opt/puppetlabs/puppet/bin/puppet --version)" == "${PUPPET_AGENT_VERSION}" ]]
then
Expand All @@ -17,7 +17,7 @@ else
yum -y install "https://yum.puppetlabs.com/puppet${PUPPET_MAJOR_VERSION}/${OS_TYPE}/${OS_VERSION}/${ARCH_TYPE}/puppet-agent-${PUPPET_AGENT_VERSION}-1.${OS_TYPE}${OS_VERSION}.${ARCH_TYPE}.rpm"
fi

yum -y install https://yum.puppetlabs.com/puppet/${OS_TYPE}/${OS_VERSION}/${ARCH_TYPE}/pdk-2.5.0.0-1.${OS_TYPE}${OS_VERSION}.${ARCH_TYPE}.rpm
yum -y install https://yum.puppetlabs.com/puppet/${OS_TYPE}/${OS_VERSION}/${ARCH_TYPE}/pdk-2.7.1.0-1.${OS_TYPE}${OS_VERSION}.${ARCH_TYPE}.rpm

# Info
/opt/puppetlabs/puppet/bin/ruby --version
Expand Down
2 changes: 1 addition & 1 deletion templates/docker-base.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"builders": [
{
"type": "docker",
"image": "shinesolutions/the-works-buildenv",
"image": "shinesolutions/the-works-buildenv:2.0.1",
"commit": true,
"run_command": [
"--privileged",
Expand Down

0 comments on commit f4e2d4c

Please sign in to comment.