ood_packaging 0.0.1.rc.5 → 0.0.1.rc.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 238830f795de725da1420192e4100403ca9b7ab54d579db94be2044b539832a5
-  data.tar.gz: 67a5fa07e2a32d23ca92e4c56bd246823b0c24c6cb8299412b33021b4d5817c8
+  metadata.gz: 774e160312368cf79021df01d8aaf851b6f4efd7ef23890a2f02b4edb5cb6202
+  data.tar.gz: 4f169c7948828b5f870e2a0d7a05dc04f95c73b62b0fd40fe7260238c9a7417f
 SHA512:
-  metadata.gz: ff7fc7dbb44fff8f70fcee969247cbd3df192da97daa9304a86a79b8d72e18bfb46eea13b86313fe234860c7f2a492478f1daa7e64a9ecf8d761085cfa2077cc
-  data.tar.gz: aaf0c73578f457acdaf05215a6e4e8448529ae5bfa5842b0243ece71f081e17c735e90299e600752ae12bd4d349f9c748e85fade5ea9ec27093e677b8ce95fb7
+  metadata.gz: fe2cc99020a235d8cfa3caffb25e26f1ef23f8454d5278093780406e37d669e9f76af2f3c2a70cab350f9c75821f5f70fddc675563569fb0b8bc618d9e4d2758
+  data.tar.gz: 45ec1cc23b9cfdc63a2c47cb077ac153bae08facb4e5d7a5486d359c5f844dd5ac1b190d6fb33ba17f17cc3ab076fed9fc5e3b00246fb9c2f17c2ce003fb29dc

data/lib/ood_packaging/build.rb

@@ -130,6 +130,7 @@ class OodPackaging::Build
   end
 
   def run!
+    fix_env!
     env_dump! if debug?
     bootstrap_rpm! if build_box.rpm?
     bootstrap_deb! if build_box.deb?
@@ -141,6 +142,10 @@ class OodPackaging::Build
     sanity!
   end
 
+  def fix_env!
+    ENV.delete('GEM_PATH')
+  end
+
   def env_dump!
     ENV.sort.to_h.each_pair do |k, v|
       puts "#{k}=#{v}"

data/lib/ood_packaging/build_box/docker-image/Dockerfile.erb

@@ -2,6 +2,7 @@ FROM <%= base_image %>
 MAINTAINER Trey Dockendorf <tdockendorf@osc.edu>
 ENV LANG=en_US.UTF-8
 ENV LC_CTYPE=en_US.UTF-8
+ENV GEM_PATH=<%= ctr_gems_dir %>:
 <% if dist == 'el7' -%>
 RUN yum update -y && yum clean all && rm -rf /var/cache/yum/*
 RUN yum install -y yum-utils epel-release centos-release-scl && yum clean all && rm -rf /var/cache/yum/*

data/lib/ood_packaging/build_box/docker-image/install.sh.erb

@@ -73,9 +73,9 @@ echo "allow-loopback-pinentry" >> <%= ctr_gpg_dir %>/gpg-agent.conf
 
 header "Install ood_packaging gem"
 <%- if rpm? && !dnf? -%>
-run scl enable <%= scl_ruby %> -- gem install --no-doc /build/*.gem
+run scl enable <%= scl_ruby %> -- gem install --no-doc --bindir <%= ctr_scripts_dir %> --install-dir <%= ctr_gems_dir %> /build/*.gem
 <%- else -%>
-run gem install --no-doc /build/*.gem
+run gem install --no-doc --bindir <%= ctr_scripts_dir %> --install-dir <%= ctr_gems_dir %> /build/*.gem
 <%- end -%>
 
 header "Copy in launch scripts"

data/lib/ood_packaging/package.rb

@@ -157,7 +157,7 @@ class OodPackaging::Package
     cmd = []
     cmd.concat exec_launchers if docker_runtime?
     cmd.concat ['scl', 'enable', scl_ruby, '--'] if podman_runtime? && build_box.scl?
-    cmd.concat ['rake']
+    cmd.concat [File.join(ctr_scripts_dir, 'rake')]
     cmd.concat ['-q'] unless debug
     cmd.concat ['-f', File.join(ctr_scripts_dir, 'Rakefile'), 'ood_packaging:package:build']
     cmd

data/lib/ood_packaging/utils.rb

@@ -67,6 +67,10 @@ module OodPackaging::Utils
     '/ondemand-packaging'
   end
 
+  def ctr_gems_dir
+    File.join(ctr_scripts_dir, 'gems')
+  end
+
   def gpg_private_key
     File.join(ctr_scripts_dir, 'ondemand.sec')
   end

data/lib/ood_packaging/version.rb

@@ -2,7 +2,7 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.0.1.rc.5'
+  VERSION = '0.0.1.rc.6'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '2.1.0',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.0.1.rc.5
+  version: 0.0.1.rc.6
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -94,10 +94,6 @@ files:
 - lib/ood_packaging/tasks.rb
 - lib/ood_packaging/utils.rb
 - lib/ood_packaging/version.rb
-- lib/tasks/package_utils.rb
-- lib/tasks/packaging.rb
-- lib/tasks/templates/Dockerfile.el.erb
-- lib/tasks/templates/Dockerfile.ubuntu.erb
 homepage: https://github.com/OSC/ondemand-packaging
 licenses:
 - MIT

data/lib/tasks/package_utils.rb

@@ -1,197 +0,0 @@
-# frozen_string_literal: true
-
-require 'English'
-require 'erb'
-require 'tempfile'
-
-# Package utilities
-module PackageUtils
-  def version
-    @version ||= if ENV['VERSION']
-                   ENV['VERSION'].to_s
-                 else
-                   tag? ? git_tag : "#{git_tag}-#{git_hash}"
-                 end
-  end
-
-  def build_timestamp
-    @build_timestamp ||= Time.now.strftime('%s')
-  end
-
-  def git_hash
-    @git_hash ||= `git rev-parse HEAD`.strip[0..6]
-  end
-
-  def git_tag
-    @git_tag ||= `git describe --tags --abbrev=0`.chomp
-  end
-
-  def numeric_tag
-    @numeric_tag ||= git_tag.delete_prefix('v')
-  end
-
-  def tag?
-    @tag ||= `git describe --exact-match --tags HEAD 2>/dev/null`.to_s != ''
-  end
-
-  def podman_runtime?
-    @podman_runtime ||= ENV['CONTAINER_RT'] == 'podman'
-  end
-
-  def docker_runtime?
-    !podman_runtime?
-  end
-
-  def container_runtime
-    podman_runtime? ? 'podman' : 'docker'
-  end
-
-  def tar
-    @tar ||= begin
-      `which gtar 1>/dev/null 2>&1`
-      $CHILD_STATUS.success? ? 'gtar' : 'tar'
-    end
-  end
-
-  def src_dir
-    ENV['OOD_SRC_DIR'] || '.'
-  end
-
-  def user
-    @user ||= Etc.getpwnam(Etc.getlogin)
-  end
-
-  def build_dir(args)
-    @build_dir ||= "#{src_dir}/build/#{build_box_image(args).gsub(':', '-')}".tap { |d| sh "mkdir -p #{d}" }
-  end
-
-  # TODO: continue vendor/ convention? Seems as good as any other name.
-  def vendor_src_dir
-    'vendor/ood/src'.tap { |p| sh "mkdir -p #{p}" }
-  end
-
-  def vendor_build_dir
-    'vendor/ood/build'.tap { |p| sh "mkdir -p #{p}" }
-  end
-
-  def dist_dir(args)
-    dist = args[:dist].to_s
-    version = args[:version].to_s
-    "dist/#{dist}#{version}"
-  end
-
-  def known_images
-    {
-      'ubuntu-20.04': '1'
-    }.freeze
-  end
-
-  def build_box_image(args)
-    base_name = "#{args[:dist]}-#{args[:version]}"
-    @version_lookup ||= Hash.new('1').merge(known_images)
-
-    "#{build_box_name}:#{base_name}-#{@version_lookup[base_name.to_sym]}"
-  end
-
-  def build_box_name
-    ENV['OOD_BUILD_BOX'] || 'ood-buildbox'
-  end
-
-  def image_exists?(image_name)
-    `#{container_runtime} inspect --type image --format exists #{image_name} || true`.chomp.eql?('exists')
-  end
-
-  def build_cmd(file, image)
-    args = [container_runtime, 'build', '-t', image, '-f', file]
-    args.concat '.' if docker_runtime?
-    args.join(' ')
-  end
-
-  def template_file(filename)
-    cwd = File.expand_path(__dir__).to_s
-    content = File.read("#{cwd}/templates/#{filename}")
-    content = ERB.new(content, trim_mode: '-').result(binding)
-
-    begin
-      t = Tempfile.new('ood-docker')
-      t.write(content)
-      t.path
-    ensure
-      t.close
-    end
-  end
-
-  def ctr_home
-    "/home/#{ctr_user}"
-  end
-
-  def ctr_user
-    'ood'
-  end
-
-  def ctr_run_args
-    [
-      '--rm', '--user', "#{ctr_user}:#{ctr_user}",
-      '-e', 'LC_CTYPE=en_US.UTF-8'
-    ].concat(rt_specific_flags)
-  end
-
-  def rt_specific_flags
-    if podman_runtime?
-      # SELinux doesn't like it if you're mounting from $HOME
-      ['--security-opt', 'label=disable', '--userns=keep-id']
-    else
-      []
-    end
-  end
-
-  def arch
-    'x86_64'
-  end
-
-  def spec_location
-    sf = Dir.glob('packaging/rpm/*.spec').first
-    raise StandardError, 'Cannot find spec file in packaging/rpm' if sf.nil?
-
-    sf
-  end
-
-  def spec_file
-    File.basename(spec_location)
-  end
-
-  def rpm_build_args
-    [git_tag_define, version_define, '-ba', '--nodeps', '-vv', spec_file]
-
-    # if git_prerelease_tag.size >= 2
-    #   git_prerelease_verison = git_prerelease_tag[0]
-    #   git_prerelease_verison = git_prerelease_verison[1..-1] if git_prerelease_verison.start_with?('v')
-    #   version_define = "--define 'package_version #{git_prerelease_verison}'"
-    #   if git_tag.size >= 2
-    #     prerelease = git_prerelease_tag[1].gsub('-', '.')
-    #     release_define = "--define 'package_release 0.#{prerelease}'"
-    #   else
-    #     release_define = "--define 'package_release 0.#{git_prerelease_tag[1]}.1'"
-    #   end
-    # else
-    #   version_define = "--define 'package_version #{git_tag_version}'"
-    #   release_define = if git_tag.size >= 2
-    #                      "--define 'package_release #{git_tag[1]}'"
-    #                    else
-    #                      ''
-    #                    end
-    # end
-  end
-
-  def version_define
-    git_tag = version.split('-')
-    git_tag_version = git_tag[0]
-    git_tag_version = git_tag_version[1..] if git_tag_version.start_with?('v')
-
-    "--define 'package_version #{git_tag_version}'"
-  end
-
-  def git_tag_define
-    "--define 'git_tag #{version}'"
-  end
-end

data/lib/tasks/packaging.rb

@@ -1,111 +0,0 @@
-# frozen_string_literal: true
-
-desc 'Package OnDemand'
-namespace :package do
-  require_relative 'package_utils'
-  include PackageUtils
-
-  desc 'Tar and zip OnDemand into packaging dir with version name v#<version>'
-  task :tar, [:output_dir] do |_task, args|
-    version = ENV['VERSION'] || ENV['CI_COMMIT_TAG']
-    version = version.gsub(/^v/, '') unless version.nil?
-
-    chdir src_dir do
-      unless version
-        latest_commit = `git rev-list --tags --max-count=1`.strip[0..6]
-        latest_tag = `git describe --tags #{latest_commit}`.strip[1..]
-        datetime = Time.now.strftime('%Y%m%d-%H%M')
-        version = "#{latest_tag}-#{datetime}-#{latest_commit}"
-      end
-
-      dir = (args[:output_dir] || 'packaging/rpm').to_s.tap { |p| sh "mkdir -p #{p}" }
-      sh "git ls-files | #{tar} -c --transform 's,^,ondemand-#{version}/,' -T - | gzip > #{dir}/v#{version}.tar.gz"
-    end
-  end
-
-  # TODO: refactor these 2 tar tasks. Debian and RHEL expect slightly different names and
-  # what's worse is the whole v prefixing mess
-  task :debian_tar, [:output_dir] do |_task, args|
-    dir = (args[:output_dir] || 'packaging').to_s.tap { |p| sh "mkdir -p #{p}" }
-    tar_file = "#{dir}/#{ood_package_tar}"
-
-    sh "rm #{tar_file}" if File.exist?(tar_file)
-    sh "git ls-files | #{tar} -c --transform 's,^,#{versioned_ood_package}/,' -T - | gzip > #{tar_file}"
-  end
-
-  task :version do
-    puts package_version
-  end
-
-  task :deb, [:dist, :version] => [:build_box] do |_task, args|
-    dir = build_dir(args)
-    Rake::Task['package:debian_tar'].invoke(dir)
-    sh "#{tar} -xzf #{dir}/#{ood_package_tar} -C #{dir}"
-
-    work_dir = "/build/#{versioned_ood_package}"
-
-    base_args = ctr_run_args
-    base_args.concat ['-v', "#{dir}:/build", '-w', work_dir.to_s]
-    base_args.concat ['-e', "DEBUILD_DPKG_BUILDPACKAGE_OPTS='-us -uc -I -i'"]
-    base_args.concat ['-e', 'HOME=/home/ood', '-e', 'USER=ood']
-    base_args.concat ['-e', "VERSION=#{ENV['VERSION']}"] unless ENV['VERSION'].nil?
-    base_args.concat [build_box_image(args)]
-    sh "#{container_runtime} run #{base_args.join(' ')} debmake -b':ruby'"
-
-    debuild_args = ['debuild', '--no-lintian']
-    sh "#{container_runtime} run #{base_args.join(' ')} #{debuild_args.join(' ')}"
-  end
-
-  task :bootstrap_rpm, [:dist, :version] => [:verify_args] do |_task, args|
-    chdir src_dir do
-      build_dir(args).tap do |d|
-        src_dir = "#{d}/rpmbuild/SOURCES".tap { |s| sh "mkdir -p #{s}" }
-        dist_dir(args).tap { |dd| sh "mkdir -p #{dd}" }
-        Rake::Task['package:tar'].invoke(src_dir)
-
-        FileUtils.cp Dir.glob('packaging/rpm/*.{fc,te,ico,png,tar.gz}'), src_dir
-        FileUtils.cp spec_location, d
-      end
-    end
-  end
-
-  desc 'Build an RPM'
-  task :rpm, [:dist, :version] => [:build_box, :bootstrap_rpm] do |_task, args|
-    dir = build_dir(args)
-    image = build_box_image(args)
-
-    base_args = ctr_run_args
-    base_args.concat ['-v', "#{dir}:#{ctr_home}", '-w', "'#{ctr_home}'"]
-    base_args.concat ['-e', "HOME=#{ctr_home}"]
-
-    chdir src_dir do
-      sh "#{container_runtime} run #{base_args.join(' ')} #{image} rpmbuild #{rpm_build_args.join(' ')}"
-      FileUtils.cp Dir.glob("#{dir}/rpmbuild/RPMS/#{arch}/*.rpm"), dist_dir(args)
-    end
-  end
-
-  namespace :rpm do
-    desc 'Build nightly RPM'
-    task :nightly, [:dist, :extra_args] do |_task, args|
-      version_major, version_minor = git_tag.gsub(/^v/, '').split('.', 3)
-      date = Time.now.strftime('%Y%m%d')
-      id = ENV['CI_PIPELINE_ID'] || Time.now.strftime('%H%M%S')
-      ENV['VERSION'] = "#{version_major}.#{version_minor}.#{date}-#{id}.#{git_hash}.nightly"
-      Rake::Task['package:rpm'].invoke(args[:dist], args[:extra_args])
-    end
-  end
-
-  task :verify_args, [:dist, :version] do |_task, args|
-    raise 'Need to specify :dist and :version' if args[:dist].nil? || args[:version].nil?
-  end
-
-  desc 'Create buildbox for Open OnDemand'
-  task :build_box, [:dist, :version] => [:verify_args] do |_task, args|
-    cmd = build_cmd(
-      template_file("Dockerfile.#{args[:dist]}.erb"),
-      build_box_image(args)
-    )
-
-    sh cmd unless image_exists?(build_box_image(args))
-  end
-end

data/lib/tasks/templates/Dockerfile.el.erb

@@ -1,21 +0,0 @@
-FROM centos:8
-
-# install all the dependencies
-RUN dnf -y update 
-RUN dnf install -y dnf-utils 
-RUN dnf config-manager --set-enabled powertools
-RUN dnf -y module enable nodejs:12 ruby:2.7
-RUN dnf install -y \
-        make gcc gcc-c++ git rsync rpm-build redhat-rpm-config
-RUN dnf install -y libselinux libselinux-devel
-RUN dnf install -y selinux-policy selinux-policy-devel
-RUN dnf install -y scl-utils
-
-RUN dnf install -y https://yum.osc.edu/ondemand/latest/ondemand-release-web-latest-1-6.noarch.rpm
-RUN dnf install -y \
-        ondemand-runtime ondemand-scldevel ondemand-build ondemand-ruby ondemand-python ondemand-nodejs 
-
-RUN dnf clean all && rm -rf /var/cache/dnf/*
-
-RUN groupadd <%= ctr_user %> && \
-    useradd --create-home --gid <%= ctr_user %> <%= ctr_user %>

data/lib/tasks/templates/Dockerfile.ubuntu.erb

@@ -1,15 +0,0 @@
-from ubuntu:20.04
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt update && \
-  apt install -y \
-    ruby=1:2.7+1 ruby-dev=1:2.7+1 \
-    nodejs npm \
-    make g++ gcc sqlite3 libsqlite3-dev \
-    debmake debhelper
-
-RUN groupadd <%= ctr_user %> && \
-    useradd --create-home --gid <%= ctr_user %> <%= ctr_user %>
-
-RUN ln -s /bin/bundle2.7 /bin/bundle