diff --git a/Dockerfile b/Dockerfile index b7f489d..3f195ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,19 +32,28 @@ ENV RUBYGEM_PUPPET_METADATA=${RUBYGEM_PUPPET_METADATA:-3.6.0} ARG RUBYGEM_MODULESYNC ENV RUBYGEM_MODULESYNC=${RUBYGEM_MODULESYNC:-3.2.0} +ARG RUBYGEM_R10K +ENV RUBYGEM_R10K=${RUBYGEM_R10K:-4.0.2} + +ARG RUBYGEM_RA10KE +ENV RUBYGEM_RA10KE=${RUBYGEM_RA10KE:-3.0.0} + COPY voxbox/Gemfile / +COPY voxbox/Rakefile / COPY Dockerfile / RUN apt-get update && apt-get upgrade -y \ - && bundle config set path.system true \ - && bundle config set jobs $(nproc) \ - && bundle install --gemfile=/Gemfile \ && apt-get purge -y "libaom*" \ && apt-get autoremove -y \ && apt-get clean \ - && rm -rf /var/lib/apt/lists/* + && bundle config set path.system true \ + && bundle config set jobs $(nproc) \ + && bundle install --gemfile=/Gemfile \ + && rm -rf /var/lib/apt/lists/* \ + && rm -rf /usr/local/lib/ruby/gems/*/cache/* \ + && rm -rf /usr/local/lib/ruby/gems/2.7.0/specifications/default/cgi-0.1.0.2.gemspec WORKDIR /repo ENTRYPOINT [ "rake" ] -CMD [ "-T" ] +CMD [ "-f", "/Rakefile", "-T" ] diff --git a/build_versions.json b/build_versions.json index 2d085bb..45db10c 100644 --- a/build_versions.json +++ b/build_versions.json @@ -10,7 +10,9 @@ "rubygem_voxpupuli_release": "3.0.1", "rubygem_puppet_metadata": "3.6.0", "rubygem_overcommit": "0.63.0", - "rubygem_modulesync": "3.2.0" + "rubygem_modulesync": "3.2.0", + "rubygem_r10k": "4.0.2", + "rubygem_ra10ke": "3.0.0" }, { "puppet_release": 8, @@ -22,7 +24,9 @@ "rubygem_voxpupuli_release": "3.0.1", "rubygem_puppet_metadata": "3.6.0", "rubygem_overcommit": "0.63.0", - "rubygem_modulesync": "3.2.0" + "rubygem_modulesync": "3.2.0", + "rubygem_r10k": "4.0.2", + "rubygem_ra10ke": "3.0.0" } ] } diff --git a/voxbox/Gemfile b/voxbox/Gemfile index 6e5fa19..7bed963 100644 --- a/voxbox/Gemfile +++ b/voxbox/Gemfile @@ -6,6 +6,8 @@ gem 'facter', ENV['RUBYGEM_FACTER'] gem 'modulesync', ENV['RUBYGEM_MODULESYNC'] gem 'puppet', ENV['RUBYGEM_PUPPET'] gem 'puppet_metadata', ENV['RUBYGEM_PUPPET_METADATA'] +gem 'r10k', ENV['RUBYGEM_R10K'] +gem 'ra10ke', ENV['RUBYGEM_RA10KE'] gem 'voxpupuli-acceptance', ENV['RUBYGEM_VOXPUPULI_ACCEPTANCE'] gem 'voxpupuli-release', ENV['RUBYGEM_VOXPUPULI_RELEASE'] gem 'voxpupuli-test', ENV['RUBYGEM_VOXPUPULI_TEST'] diff --git a/voxbox/Rakefile b/voxbox/Rakefile new file mode 100644 index 0000000..58c2cc8 --- /dev/null +++ b/voxbox/Rakefile @@ -0,0 +1,6 @@ +require 'voxpupuli/test/rake' +require 'voxpupuli/acceptance/rake' +require 'voxpupuli/release/rake_tasks' +require 'ra10ke' + +Ra10ke::RakeTask.new