r10k 3.15.0 → 4.1.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.15.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-28 00:00:00.000000000 Z
+date: 2024-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -72,82 +72,60 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: gettext-setup
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.24'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.24'
-- !ruby/object:Gem::Dependency
-  name: fast_gettext
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '6'
 - !ruby/object:Gem::Dependency
-  name: gettext
+  name: gettext-setup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '0.24'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '0.24'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -215,6 +193,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitattributes"
+- ".github/dependabot.yml"
 - ".github/pull_request_template.md"
 - ".github/workflows/docker.yml"
 - ".github/workflows/release.yml"
@@ -244,19 +223,6 @@ files:
 - doc/git/providers.mkd
 - doc/puppetfile.mkd
 - doc/updating-your-puppetfile.mkd
-- docker/.gitignore
-- docker/.rspec
-- docker/Gemfile
-- docker/Makefile
-- docker/README.md
-- docker/docker-compose.yml
-- docker/r10k/Dockerfile
-- docker/r10k/adduser.sh
-- docker/r10k/docker-entrypoint.d/10-analytics.sh
-- docker/r10k/docker-entrypoint.sh
-- docker/r10k/release.Dockerfile
-- docker/spec/dockerfile_spec.rb
-- docker/spec/fixtures/Puppetfile
 - integration/Gemfile
 - integration/README.mkd
 - integration/Rakefile
@@ -283,13 +249,11 @@ files:
 - integration/tests/Puppetfile/HTTP_PROXY_affects_git_source.rb
 - integration/tests/README.mkd
 - integration/tests/basic_functionality/basic_deployment.rb
-- integration/tests/basic_functionality/install_pe_only_module_with_puppetfile.rb
 - integration/tests/basic_functionality/negative/neg_deploy_with_invalid_r10k_yaml.rb
 - integration/tests/basic_functionality/negative/neg_deploy_with_missing_r10k_yaml.rb
 - integration/tests/basic_functionality/negative/neg_invalid_git_provider.rb
 - integration/tests/basic_functionality/negative/negative_bad_proxy.rb
 - integration/tests/basic_functionality/proxy_specified_in_configuration.rb
-- integration/tests/basic_functionality/proxy_with_pe_only_module.rb
 - integration/tests/basic_functionality/proxy_with_puppetfile.rb
 - integration/tests/basic_functionality/rugged_git_provider_with_ssh.rb
 - integration/tests/basic_functionality/rugged_git_provider_without_ssh.rb
@@ -308,8 +272,7 @@ files:
 - integration/tests/i18n/deploy_module_with_unicode_in_file_name.rb
 - integration/tests/purging/content_not_purged_at_root.rb
 - integration/tests/purging/default_purging.rb
-- integration/tests/purging/does_not_purge_files_on_white_list.rb
-- integration/tests/purging/invalid_whitelist_types.rb
+- integration/tests/purging/does_not_purge_files_on_allowlist.rb
 - integration/tests/user_scenario/basic_workflow/multi_env_1000_branches.rb
 - integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module.rb
 - integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module_static.rb
@@ -327,7 +290,6 @@ files:
 - integration/tests/user_scenario/basic_workflow/negative/neg_inaccessible_forge.rb
 - integration/tests/user_scenario/basic_workflow/negative/neg_invalid_env_name.rb
 - integration/tests/user_scenario/basic_workflow/negative/neg_invalid_puppet_file.rb
-- integration/tests/user_scenario/basic_workflow/negative/neg_module_specified_at_deleted_release.rb
 - integration/tests/user_scenario/basic_workflow/negative/neg_read_only.rb
 - integration/tests/user_scenario/basic_workflow/negative/neg_specify_deleted_forge_module.rb
 - integration/tests/user_scenario/basic_workflow/single_env_10000_files.rb
@@ -336,7 +298,6 @@ files:
 - integration/tests/user_scenario/basic_workflow/single_env_custom_module.rb
 - integration/tests/user_scenario/basic_workflow/single_env_large_files.rb
 - integration/tests/user_scenario/basic_workflow/single_env_module_already_installed.rb
-- integration/tests/user_scenario/basic_workflow/single_env_module_last_release_deleted.rb
 - integration/tests/user_scenario/basic_workflow/single_env_non-existent_base_dir.rb
 - integration/tests/user_scenario/basic_workflow/single_env_purge_unmanaged_modules.rb
 - integration/tests/user_scenario/basic_workflow/single_env_switch_forge_git_module.rb
@@ -371,7 +332,6 @@ files:
 - lib/r10k/deployment.rb
 - lib/r10k/deployment/config.rb
 - lib/r10k/environment.rb
-- lib/r10k/environment/bare.rb
 - lib/r10k/environment/base.rb
 - lib/r10k/environment/git.rb
 - lib/r10k/environment/name.rb
@@ -467,155 +427,6 @@ files:
 - locales/r10k.pot
 - r10k.gemspec
 - r10k.yaml.example
-- spec/fixtures/empty/.empty
-- spec/fixtures/integration/git/puppet-boolean-bare.tar
-- spec/fixtures/module/forge/bad_module/metadata.json
-- spec/fixtures/module/forge/eight_hundred/Modulefile
-- spec/fixtures/module/forge/eight_hundred/metadata.json
-- spec/fixtures/tarball/tarball.tar.gz
-- spec/fixtures/unit/action/r10k.yaml
-- spec/fixtures/unit/action/r10k_cachedir.yaml
-- spec/fixtures/unit/action/r10k_creds.yaml
-- spec/fixtures/unit/action/r10k_forge_auth.yaml
-- spec/fixtures/unit/action/r10k_forge_auth_no_url.yaml
-- spec/fixtures/unit/action/r10k_generate_types.yaml
-- spec/fixtures/unit/action/r10k_logging.yaml
-- spec/fixtures/unit/action/r10k_puppet_path.yaml
-- spec/fixtures/unit/puppetfile/argument-error/Puppetfile
-- spec/fixtures/unit/puppetfile/default-branch-override/Puppetfile
-- spec/fixtures/unit/puppetfile/duplicate-module-error/Puppetfile
-- spec/fixtures/unit/puppetfile/forge-override/Puppetfile
-- spec/fixtures/unit/puppetfile/invalid-syntax/Puppetfile
-- spec/fixtures/unit/puppetfile/load-error/Puppetfile
-- spec/fixtures/unit/puppetfile/name-error/Puppetfile
-- spec/fixtures/unit/puppetfile/valid-forge-with-version/Puppetfile
-- spec/fixtures/unit/puppetfile/valid-forge-without-version/Puppetfile
-- spec/fixtures/unit/puppetfile/various-modules/Puppetfile
-- spec/fixtures/unit/puppetfile/various-modules/Puppetfile.new
-- spec/fixtures/unit/puppetfile/various-modules/modules/apt/.gitkeep
-- spec/fixtures/unit/puppetfile/various-modules/modules/baz/.gitkeep
-- spec/fixtures/unit/puppetfile/various-modules/modules/buzz/.gitkeep
-- spec/fixtures/unit/puppetfile/various-modules/modules/canary/.gitkeep
-- spec/fixtures/unit/puppetfile/various-modules/modules/fizz/.gitkeep
-- spec/fixtures/unit/puppetfile/various-modules/modules/rpm/.gitkeep
-- spec/fixtures/unit/util/purgeable/managed_one/expected_1
-- spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/managed_symlink_file
-- spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_allowlisted_2/ignored_1
-- spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_expected_1
-- spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_unmanaged_1
-- spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/unmanaged_symlink_dir
-- spec/fixtures/unit/util/purgeable/managed_one/managed_symlink_dir
-- spec/fixtures/unit/util/purgeable/managed_one/unmanaged_1
-- spec/fixtures/unit/util/purgeable/managed_one/unmanaged_symlink_file
-- spec/fixtures/unit/util/purgeable/managed_two/.hidden/unmanaged_3
-- spec/fixtures/unit/util/purgeable/managed_two/expected_2
-- spec/fixtures/unit/util/purgeable/managed_two/unmanaged_2
-- spec/fixtures/unit/util/subprocess/runner/no-execute.sh
-- spec/integration/git/rugged/bare_repository_spec.rb
-- spec/integration/git/rugged/cache_spec.rb
-- spec/integration/git/rugged/thin_repository_spec.rb
-- spec/integration/git/rugged/working_repository_spec.rb
-- spec/integration/git/shellgit/bare_repository_spec.rb
-- spec/integration/git/shellgit/thin_repository_spec.rb
-- spec/integration/git/shellgit/working_repository_spec.rb
-- spec/integration/git/stateful_repository_spec.rb
-- spec/integration/util/purageable_spec.rb
-- spec/matchers/exit_with.rb
-- spec/matchers/match_realpath.rb
-- spec/r10k-mocks.rb
-- spec/r10k-mocks/mock_config.rb
-- spec/r10k-mocks/mock_env.rb
-- spec/r10k-mocks/mock_source.rb
-- spec/shared-contexts/git-fixtures.rb
-- spec/shared-contexts/tarball.rb
-- spec/shared-examples/deploy-actions.rb
-- spec/shared-examples/git-repository.rb
-- spec/shared-examples/git/bare_repository.rb
-- spec/shared-examples/git/thin_repository.rb
-- spec/shared-examples/git/working_repository.rb
-- spec/shared-examples/puppetfile-action.rb
-- spec/shared-examples/settings/ancestry.rb
-- spec/shared-examples/subprocess-runner.rb
-- spec/spec_helper.rb
-- spec/unit/action/cri_runner_spec.rb
-- spec/unit/action/deploy/deploy_helpers_spec.rb
-- spec/unit/action/deploy/display_spec.rb
-- spec/unit/action/deploy/environment_spec.rb
-- spec/unit/action/deploy/module_spec.rb
-- spec/unit/action/puppetfile/check_spec.rb
-- spec/unit/action/puppetfile/cri_runner_spec.rb
-- spec/unit/action/puppetfile/install_spec.rb
-- spec/unit/action/puppetfile/purge_spec.rb
-- spec/unit/action/runner_spec.rb
-- spec/unit/action/visitor_spec.rb
-- spec/unit/cli_spec.rb
-- spec/unit/deployment/config_spec.rb
-- spec/unit/deployment_spec.rb
-- spec/unit/environment/bare_spec.rb
-- spec/unit/environment/base_spec.rb
-- spec/unit/environment/git_spec.rb
-- spec/unit/environment/name_spec.rb
-- spec/unit/environment/plain_spec.rb
-- spec/unit/environment/svn_spec.rb
-- spec/unit/environment/tarball_spec.rb
-- spec/unit/environment/with_modules_spec.rb
-- spec/unit/errors/formatting_spec.rb
-- spec/unit/feature_spec.rb
-- spec/unit/forge/module_release_spec.rb
-- spec/unit/git/alternates_spec.rb
-- spec/unit/git/cache_spec.rb
-- spec/unit/git/rugged/cache_spec.rb
-- spec/unit/git/rugged/credentials_spec.rb
-- spec/unit/git/shellgit/cache_spec.rb
-- spec/unit/git/stateful_repository_spec.rb
-- spec/unit/git_spec.rb
-- spec/unit/initializers_spec.rb
-- spec/unit/instance_cache_spec.rb
-- spec/unit/keyed_factory_spec.rb
-- spec/unit/logging/terminaloutputter_spec.rb
-- spec/unit/logging_spec.rb
-- spec/unit/module/base_spec.rb
-- spec/unit/module/forge_spec.rb
-- spec/unit/module/git_spec.rb
-- spec/unit/module/metadata_file_spec.rb
-- spec/unit/module/svn_spec.rb
-- spec/unit/module/tarball_spec.rb
-- spec/unit/module_loader/puppetfile_spec.rb
-- spec/unit/module_spec.rb
-- spec/unit/puppetfile_spec.rb
-- spec/unit/settings/collection_spec.rb
-- spec/unit/settings/container_spec.rb
-- spec/unit/settings/definition_spec.rb
-- spec/unit/settings/enum_definition_spec.rb
-- spec/unit/settings/inheritance_spec.rb
-- spec/unit/settings/list_spec.rb
-- spec/unit/settings/loader_spec.rb
-- spec/unit/settings/uri_definition_spec.rb
-- spec/unit/settings_spec.rb
-- spec/unit/source/base_spec.rb
-- spec/unit/source/exec_spec.rb
-- spec/unit/source/git_spec.rb
-- spec/unit/source/hash_spec.rb
-- spec/unit/source/svn_spec.rb
-- spec/unit/source/yaml_spec.rb
-- spec/unit/source_spec.rb
-- spec/unit/svn/remote_spec.rb
-- spec/unit/svn/working_dir_spec.rb
-- spec/unit/tarball_spec.rb
-- spec/unit/util/attempt_spec.rb
-- spec/unit/util/cacheable_spec.rb
-- spec/unit/util/commands_spec.rb
-- spec/unit/util/downloader_spec.rb
-- spec/unit/util/exec_env_spec.rb
-- spec/unit/util/purgeable_spec.rb
-- spec/unit/util/setopts_spec.rb
-- spec/unit/util/subprocess/result_spec.rb
-- spec/unit/util/subprocess/runner/posix_spec.rb
-- spec/unit/util/subprocess/runner/pump_spec.rb
-- spec/unit/util/subprocess/runner/windows_spec.rb
-- spec/unit/util/subprocess/subprocess_error_spec.rb
-- spec/unit/util/subprocess_spec.rb
-- spec/unit/util/symbolize_keys_spec.rb
 homepage: https://github.com/puppetlabs/r10k
 licenses:
 - Apache-2.0
@@ -628,7 +439,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/docker/.gitignore

@@ -1 +0,0 @@
-TEST-rspec.xml

data/docker/.rspec

@@ -1,4 +0,0 @@
---require pupperware/spec_helper
---format RspecJunitFormatter
---out TEST-rspec.xml
---format documentation

data/docker/Gemfile

@@ -1,11 +0,0 @@
-source "https://rubygems.org"
-
-gem 'pupperware',
-    :git => 'https://github.com/puppetlabs/pupperware.git',
-    :branch => 'main',
-    :glob => 'gem/*.gemspec'
-
-group :test do
-    gem 'rspec'
-    gem 'rspec_junit_formatter'
-end

data/docker/Makefile

@@ -1,99 +0,0 @@
-PUPPERWARE_ANALYTICS_STREAM ?= dev
-NAMESPACE ?= puppet
-git_describe = $(shell git describe --tags)
-vcs_ref := $(shell git rev-parse HEAD)
-build_date := $(shell date -u +%FT%T)
-hadolint_available := $(shell hadolint --help > /dev/null 2>&1; echo $$?)
-hadolint_command := hadolint
-hadolint_container := ghcr.io/hadolint/hadolint:latest
-alpine_version := 3.14
-# --load (--output=type=docker) can only be used with a single arch / platform
-# https://github.com/docker/buildx/issues/59
-output_type := docker
-platform := linux/amd64
-export BUNDLE_PATH = $(PWD)/.bundle/gems
-export BUNDLE_BIN = $(PWD)/.bundle/bin
-export GEMFILE = $(PWD)/Gemfile
-export DOCKER_BUILDKIT ?= 1
-
-ifeq ($(IS_RELEASE),true)
-	VERSION ?= $(shell echo $(git_describe) | sed 's/-.*//')
-	PUBLISHED_VERSION ?= $(shell curl --silent 'https://rubygems.org/api/v1/gems/r10k.json' | jq '."version"' | tr -d '"')
-	CONTAINER_EXISTS = $(shell DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect $(NAMESPACE)/r10k:$(VERSION) > /dev/null 2>&1; echo $$?)
-ifeq ($(CONTAINER_EXISTS),0)
-	SKIP_BUILD ?= true
-else ifneq ($(VERSION),$(PUBLISHED_VERSION))
-	SKIP_BUILD ?= true
-endif
-
-	LATEST_VERSION ?= latest
-	dockerfile := release.Dockerfile
-	dockerfile_context := r10k
-else
-	VERSION ?= edge
-	IS_LATEST := false
-	dockerfile := Dockerfile
-	dockerfile_context := $(PWD)/..
-endif
-
-ifeq ($(IS_LATEST),true)
-	latest_tag := --tag $(NAMESPACE)/r10k:$(LATEST_VERSION)
-endif
-
-prep:
-	@git fetch --unshallow 2> /dev/null ||:
-	@git fetch origin 'refs/tags/*:refs/tags/*'
-ifeq ($(SKIP_BUILD),true)
-	@echo "SKIP_BUILD is true, exiting with 1"
-	@exit 1
-endif
-
-lint:
-ifeq ($(hadolint_available),0)
-	@$(hadolint_command) r10k/$(dockerfile)
-else
-	@docker pull $(hadolint_container)
-	@docker run --rm -v $(PWD)/r10k/$(dockerfile):/Dockerfile -i $(hadolint_container) $(hadolint_command) Dockerfile
-endif
-
-build: prep
-	docker pull alpine:$(alpine_version)
-	docker buildx build \
-		${DOCKER_BUILD_FLAGS} \
-		--output=type=$(output_type) \
-		--platform $(platform) \
-		--build-arg alpine_version=$(alpine_version) \
-		--build-arg vcs_ref=$(vcs_ref) \
-		--build-arg build_date=$(build_date) \
-		--build-arg version=$(VERSION) \
-		--build-arg pupperware_analytics_stream=$(PUPPERWARE_ANALYTICS_STREAM) \
-		--file r10k/$(dockerfile) \
-		--tag $(NAMESPACE)/r10k:$(VERSION) $(latest_tag) $(dockerfile_context)
-
-test: prep
-	@bundle install --path $$BUNDLE_PATH --gemfile $$GEMFILE --with test
-	@bundle update
-	@PUPPET_TEST_DOCKER_IMAGE=$(NAMESPACE)/r10k:$(VERSION) \
-		bundle exec --gemfile $$GEMFILE \
-		rspec spec
-
-# call build to produce multiple architectures
-# uses cached output from amd64 build target if it exists
-# registry output is equivalent to --push
-push-image: platform=linux/amd64,linux/arm64
-push-image: output_type=registry
-push-image: prep build
-
-push-readme:
-	@docker pull sheogorath/readme-to-dockerhub
-	@docker run --rm \
-		-v $(PWD)/README.md:/data/README.md \
-		-e DOCKERHUB_USERNAME="$(DOCKERHUB_USERNAME)" \
-		-e DOCKERHUB_PASSWORD="$(DOCKERHUB_PASSWORD)" \
-		-e DOCKERHUB_REPO_PREFIX=puppet \
-		-e DOCKERHUB_REPO_NAME=r10k \
-		sheogorath/readme-to-dockerhub
-
-publish: push-image push-readme
-
-.PHONY: lint build test prep publish push-image push-readme

data/docker/README.md

@@ -1,28 +0,0 @@
-# [puppetlabs/r10k](https://github.com/puppetlabs/r10k)
-
-r10k on a Docker image. Based on Alpine 3.8.
-
-## Configuration
-
-The following environment variables are supported:
-
-- `PUPPERWARE_ANALYTICS_ENABLED`
-
-  Set to 'true' to enable Google Analytics metrics. Defaults to 'false'.
-
-## Analytics Data Collection
-
-The r10k container collects usage data. This is disabled by default. You can enable it by passing `--env PUPPERWARE_ANALYTICS_ENABLED=true`
-to your `docker run` command.
-
-### What data is collected?
-* Version of the r10k container.
-* Anonymized IP address is used by Google Analytics for Geolocation data, but the IP address is not collected.
-
-### Why does the r10k container collect data?
-
-We collect data to help us understand how the containers are used and make decisions about upcoming changes.
-
-### How can I opt out of r10k container data collection?
-
-This is disabled by default.

data/docker/docker-compose.yml

@@ -1,18 +0,0 @@
-version: '3.7'
-
-services:
-  r10k_check:
-    image: ${R10K_IMAGE:-puppet/r10k}
-    environment:
-      - PUPPERWARE_ANALYTICS_ENABLED=${PUPPERWARE_ANALYTICS_ENABLED:-false}
-    command: 'puppetfile check --verbose --trace --puppetfile test/Puppetfile'
-    volumes:
-      - ${SPEC_DIRECTORY}/fixtures:/home/puppet/test
-
-  r10k_install:
-    image: ${R10K_IMAGE:-puppet/r10k}
-    environment:
-      - PUPPERWARE_ANALYTICS_ENABLED=${PUPPERWARE_ANALYTICS_ENABLED:-false}
-    command: 'puppetfile install --verbose --trace --puppetfile test/Puppetfile'
-    volumes:
-      - ${SPEC_DIRECTORY}/fixtures:/home/puppet/test

data/docker/r10k/Dockerfile

@@ -1,68 +0,0 @@
-ARG alpine_version=3.14
-FROM alpine:${alpine_version} as build
-
-# hadolint ignore=DL3018
-RUN apk add --no-cache ruby git && \
-    mkdir /workspace
-WORKDIR /workspace
-COPY . /workspace
-RUN gem build r10k.gemspec && \
-    mv r10k*.gem r10k.gem
-
-FROM alpine:${alpine_version}
-
-ARG vcs_ref
-ARG build_date
-ARG version="3.1.0"
-# Used by entrypoint to submit metrics to Google Analytics.
-# Published images should use "production" for this build_arg.
-ARG pupperware_analytics_stream="dev"
-# required to schedule runs of "r10k" in K8s
-ARG supercronic_version="0.1.9"
-ARG supercronic_sha1sum="5ddf8ea26b56d4a7ff6faecdd8966610d5cb9d85"
-ARG supercronic="supercronic-linux-amd64"
-ARG supercronic_url="https://github.com/aptible/supercronic/releases/download/v$supercronic_version/$supercronic"
-
-LABEL org.label-schema.maintainer="Puppet Release Team <release@puppet.com>" \
-      org.label-schema.vendor="Puppet" \
-      org.label-schema.url="https://github.com/puppetlabs/r10k" \
-      org.label-schema.name="r10k" \
-      org.label-schema.license="Apache-2.0" \
-      org.label-schema.vcs-url="https://github.com/puppetlabs/r10k" \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.dockerfile="/Dockerfile"
-
-COPY docker/r10k/adduser.sh docker/r10k/docker-entrypoint.sh /
-COPY docker/r10k/docker-entrypoint.d /docker-entrypoint.d
-
-ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["help"]
-
-# dynamic LABELs and ENV vars placed lower for the sake of Docker layer caching
-ENV PUPPERWARE_ANALYTICS_STREAM="$pupperware_analytics_stream"
-
-LABEL org.label-schema.version="$version" \
-      org.label-schema.vcs-ref="$vcs_ref" \
-      org.label-schema.build-date="$build_date"
-
-COPY --from=build /workspace/r10k.gem /
-SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
-# ignore apk and gem pinning
-# hadolint ignore=DL3018,DL3028
-RUN chmod a+x /adduser.sh /docker-entrypoint.sh /docker-entrypoint.d/*.sh && \
-# Add a puppet user to run r10k as for consistency with puppetserver
-    /adduser.sh && \
-    chown -R puppet: /docker-entrypoint.d /docker-entrypoint.sh && \
-    apk add --no-cache ruby openssh-client git ruby-rugged curl ruby-json ruby-etc && \
-    gem install --no-doc /r10k.gem && \
-    rm -f /r10k.gem && \
-    curl --fail --silent --show-error --location --remote-name "$supercronic_url" && \
-    echo "${supercronic_sha1sum}  ${supercronic}" | sha1sum -c - && \
-    chmod +x "$supercronic" && \
-    mv "$supercronic" "/usr/local/bin/${supercronic}" && \
-    ln -s "/usr/local/bin/${supercronic}" /usr/local/bin/supercronic
-
-USER puppet
-WORKDIR /home/puppet
-
-COPY docker/r10k/Dockerfile /

data/docker/r10k/adduser.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-getent_string="$(getent group | grep -e ':999$')"
-exit_code=$?
-
-if [ "$exit_code" = '0' ]; then
-  group="$(echo $getent_string | cut -d ':' -f1)"
-else
-  addgroup -g 999 puppet
-  group='puppet'
-fi
-
-adduser -G $group -D -u 999 puppet

data/docker/r10k/docker-entrypoint.d/10-analytics.sh

@@ -1,30 +0,0 @@
-#!/bin/sh
-
-if [ "${PUPPERWARE_ANALYTICS_ENABLED}" != "true" ]; then
-    # Don't print out any messages here since this is a CLI container
-    exit 0
-fi
-
-# See: https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters
-# Tracking ID
-tid=UA-132486246-5
-# Application Name
-an=r10k
-# Application Version
-av=$(r10k version | cut -d ' ' -f 2)
-# Anonymous Client ID
-_file=/var/tmp/pwclientid
-cid=$(cat $_file 2>/dev/null || (cat /proc/sys/kernel/random/uuid | tee $_file))
-# Event Category
-ec=${PUPPERWARE_ANALYTICS_STREAM:-dev}
-# Event Action
-ea=start
-# Anonymize ip
-aip=1
-
-_params="v=1&t=event&tid=${tid}&an=${an}&av=${av}&cid=${cid}&ec=${ec}&ea=${ea}&aip=${aip}"
-_url="http://www.google-analytics.com/collect?${_params}"
-
-# Don't print out any messages here since this is a CLI container
-curl --fail --silent --show-error --output /dev/null \
-    -X POST -H "Content-Length: 0" $_url

data/docker/r10k/docker-entrypoint.sh

@@ -1,10 +0,0 @@
-#! /bin/sh
-
-set -e
-
-for f in /docker-entrypoint.d/*.sh; do
-  # Don't print out any messages here since this is a CLI container
-  "$f"
-done
-
-exec /usr/bin/r10k "$@"