pkgr 1.8.0 → 1.9.1

data/data/dependencies/centos.yml

@@ -4,7 +4,6 @@ default:
   - libxml2
   - libxslt
   - libevent
-  - mysql-libs
   - sqlite
 centos-6:
   - postgresql-libs
@@ -12,3 +11,7 @@ centos-7:
   - postgresql-libs
 centos-8:
   - libpq
+centos-9:
+  - libpq
+centos-10:
+  - libpq

data/data/dependencies/debian.yml

@@ -1,5 +1,4 @@
 default:
-  - mysql-common
   - libpq5
   - libsqlite3-0
   - openssl
@@ -7,7 +6,6 @@ default:
   - libxslt1.1
 debian-6:
   - libssl0.9.8
-  - libmysqlclient16
   - libevent-1.4-2
   - libevent-core-1.4-2
   - libevent-extra-1.4-2
@@ -15,7 +13,6 @@ debian-6:
   - libreadline6
 debian-7:
   - libssl1.0.0
-  - libmysqlclient18
   - libevent-2.0-5
   - libevent-core-2.0-5
   - libevent-extra-2.0-5
@@ -23,7 +20,6 @@ debian-7:
   - libreadline6
 debian-8:
   - libssl1.0.0
-  - libmysqlclient18
   - libevent-2.0-5
   - libevent-core-2.0-5
   - libevent-extra-2.0-5
@@ -31,7 +27,6 @@ debian-8:
   - libreadline6
 debian-9:
   - libssl1.0.2
-  - libmariadbclient18
   - libevent-2.0-5
   - libevent-core-2.0-5
   - libevent-extra-2.0-5

data/data/dependencies/sles.yml

@@ -7,9 +7,8 @@ default:
   - sqlite3
   - shadow
 sles-11:
-  - libmysqlclient15
-  - libmysqlclient_r15
   - postgresql
 sles-12:
-  - libmysqlclient18
   - postgresql
+sles-15: []
+sles-16: []

data/data/dependencies/ubuntu.yml

@@ -1,48 +1,61 @@
 default:
-  - mysql-common
   - libpq5
   - libsqlite3-0
   - openssl
-  - libxml2
   - libxslt1.1
 ubuntu-10.04:
   - libreadline5
   - libssl0.9.8
-  - libmysqlclient16
   - libevent-1.4-2
   - libevent-core-1.4-2
   - libevent-extra-1.4-2
+  - libxml2
 ubuntu-12.04:
   - libreadline6
   - libssl1.0.0
-  - libmysqlclient18
   - libevent-2.0-5
   - libevent-core-2.0-5
   - libevent-extra-2.0-5
+  - libxml2
 ubuntu-14.04:
   - libreadline6
   - libssl1.0.0
-  - libmysqlclient18
   - libevent-2.0-5
   - libevent-core-2.0-5
   - libevent-extra-2.0-5
+  - libxml2
 ubuntu-16.04:
   - libreadline6
   - libssl1.0.0
-  - libmysqlclient20
   - libevent-2.0-5
   - libevent-core-2.0-5
   - libevent-extra-2.0-5
+  - libxml2
 ubuntu-18.04:
   - libreadline7
   - libssl1.0.0
-  - libmysqlclient20
   - libevent-2.1-6
   - libevent-core-2.1-6
   - libevent-extra-2.1-6
+  - libxml2
 ubuntu-20.04:
   - libreadline8
   - libssl1.1
   - libevent-2.1-7
   - libevent-core-2.1-7
   - libevent-extra-2.1-7
+  - libxml2
+ubuntu-22.04:
+  - libreadline8
+  - libssl3
+  - libev4
+  - libxml2
+ubuntu-24.04:
+  - libreadline8
+  - libssl3
+  - libev4
+  - libxml2
+ubuntu-26.04:
+  - libreadline8
+  - libssl3
+  - libev4

data/data/hooks/postinstall.sh

@@ -10,23 +10,27 @@ export APP_HOME="<%= home %>"
 HOME_LOGS="${APP_HOME}/log"
 LOGS="/var/log/${APP_NAME}"
 
-chown -R ${APP_USER}.${APP_GROUP} ${APP_HOME}
+chown -R ${APP_USER}:${APP_GROUP} ${APP_HOME}
 
 # link app log directory to /var/log/NAME
 mkdir -p ${LOGS}
 rm -rf ${HOME_LOGS}
-ln -fs ${LOGS} ${HOME_LOGS}
-chown -R ${APP_USER}.${APP_GROUP} ${LOGS}
+ln -nfs ${LOGS} ${HOME_LOGS}
+chown -R ${APP_USER}:${APP_GROUP} ${LOGS}
 
 # Add default conf.d file
 [ -f /etc/${APP_NAME}/conf.d/other ] || touch /etc/${APP_NAME}/conf.d/other
 
-chown -R ${APP_USER}.${APP_GROUP} /etc/${APP_NAME}
-chown ${APP_USER}.${APP_GROUP} /var/db/${APP_NAME}
+chown -R ${APP_USER}:${APP_GROUP} /etc/${APP_NAME}
+chown ${APP_USER}:${APP_GROUP} /var/db/${APP_NAME}
 
 chmod 0750 /etc/${APP_NAME} /etc/${APP_NAME}/conf.d
 find /etc/${APP_NAME} -type f -exec chmod 0640 {} +
 
+<% if crons.any? %>
+mkdir -p "<%= crons_dir %>"
+<% end %>
+
 <% crons.each do |cron| %>
 rm -f <%= cron.destination %>
 cp <%= cron.source %> <%= cron.destination %>

data/data/hooks/preinstall.sh

@@ -8,7 +8,7 @@ export APP_GROUP="<%= group %>"
 export APP_HOME="<%= home %>"
 
 if ! getent passwd "${APP_USER}" > /dev/null; then
-  if [ -f /etc/redhat-release ] || [ -f /etc/system-release ] || [ -f /etc/SuSE-release ]; then
+  if command -v groupadd &>/dev/null ; then
     if ! getent group "${APP_GROUP}" > /dev/null ; then
       groupadd --system "${APP_GROUP}"
     fi

data/data/init/systemd/default/process.service.erb

@@ -4,12 +4,11 @@ Requires=<%= name %>-<%= process_name %>.service
 After=<%= name %>-<%= process_name %>.service
 
 [Service]
+User=<%= user %>
+Group=<%= group %>
 Environment=APP_PROCESS_INDEX=__PROCESS_INDEX__
 ExecStart=/usr/bin/<%= name %> run <%= process_name %>
 Restart=always
-StandardOutput=syslog
-StandardError=syslog
-SyslogIdentifier=%n
 
 [Install]
 WantedBy=<%= name %>-<%= process_name %>.service

data/data/init/sysv/lsb-3.1/process.erb

@@ -24,8 +24,10 @@ full_process_name="${name}-${process_name}-${APP_PROCESS_INDEX}"
 pidfile="/var/run/${full_process_name}.pid"
 
 start() {
-  # Run the program!
-  ${name} run ${process_name} >> /var/log/${name}/${process_name}-${APP_PROCESS_INDEX}.log 2>&1 &
+  # Run the program! /var/log/${name} is writable by the app user, so the log
+  # file is only opened once privileges are dropped.
+  chroot --userspec "${user}:${group}" --groups="$(id -Gn ${user} | tr ' ' ',')" / \
+    sh -c 'exec "$@" >> "$0" 2>&1' "/var/log/${name}/${process_name}-${APP_PROCESS_INDEX}.log" ${name} run ${process_name} &
 
   # Generate the pidfile from here. If we instead made the forked process
   # generate it there will be a race condition between the pidfile writing

data/lib/pkgr/builder.rb

@@ -45,7 +45,7 @@ module Pkgr
         opts[:input] = $stdin.read
       end
 
-      tarball_extract = Mixlib::ShellOut.new("tar xzf #{tarball} -C #{source_dir}", opts)
+      tarball_extract = Mixlib::ShellOut.new("tar xzf #{tarball} --no-same-owner -C #{source_dir}", opts)
       tarball_extract.logger = Pkgr.logger
       tarball_extract.run_command
       tarball_extract.error!
@@ -69,6 +69,8 @@ module Pkgr
       end
       config.distribution = distribution
       config.env.variables.push("TARGET=#{distribution.target}")
+      config.env.variables.push("APP_PKG_VERSION=#{config.version}")
+      config.env.variables.push("APP_PKG_ITERATION=#{config.iteration}")
       # useful for templates that need to read files
       config.source_dir = source_dir
       config.build_dir = build_dir
@@ -163,12 +165,18 @@ module Pkgr
       end
     end
 
-    # Write cron files
+    # Write cron files. They are installed as root, so they get installed from a
+    # root-owned copy rather than from the app directory, which the app user
+    # can write to.
     def setup_crons
       crons_dir = File.join("/", distribution.crons_dir)
+      config.crons_dir = crons_dir
 
       config.crons.map! do |cron_path|
-        Cron.new(File.expand_path(cron_path, config.home), File.join(crons_dir, File.basename(cron_path)))
+        source = File.join("/", shared_dir, "crons", File.basename(cron_path))
+        FileUtils.mkdir_p File.dirname(File.join(build_dir, source))
+        FileUtils.cp File.join(build_dir, File.expand_path(cron_path, config.home)), File.join(build_dir, source)
+        Cron.new(source, File.join(crons_dir, File.basename(cron_path)))
       end
 
       config.crons.each do |cron|
@@ -259,8 +267,15 @@ module Pkgr
       File.join(vendor_dir, "processes")
     end
 
+    # Root-owned directory for files that are read as root at install time.
+    def shared_dir
+      File.join("usr", "share", config.name)
+    end
+
+    # Init templates are copied to system locations as root, so keep them out
+    # of the app directory.
     def scaling_dir
-      File.join(vendor_dir, "scaling")
+      File.join(build_dir, shared_dir, "scaling")
     end
 
     # Returns the path to the app's (supposedly present) Procfile.

data/lib/pkgr/buildpack.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'digest/sha1'
+require 'shellwords'
 
 module Pkgr
   class Buildpack
@@ -24,7 +25,7 @@ module Pkgr
     def initialize(url, type = :builtin, env = nil)
       @uuid = Digest::SHA1.hexdigest(url)
       @url, @branch = url.split("#")
-      @branch ||= "master"
+      @branch ||= "main"
       @type = type
       @env = env || Env.new
     end
@@ -85,7 +86,12 @@ module Pkgr
     def refresh(edge = true)
       return if !edge
       Dir.chdir(dir) do
-        buildpack_refresh = Mixlib::ShellOut.new("git fetch origin && ( git reset --hard #{branch} || git reset --hard origin/#{branch} ) && chmod -f +x bin/detect && chmod -f +x bin/compile && chmod -f +x bin/release")
+        git_fetch = Mixlib::ShellOut.new("git fetch --tags origin")
+        git_fetch.logger = Pkgr.logger
+        git_fetch.run_command
+        git_fetch.error!
+
+        buildpack_refresh = Mixlib::ShellOut.new("git reset --hard #{Shellwords.shellescape(ref_for_checkout)} && chmod -f +x bin/detect && chmod -f +x bin/compile && chmod -f +x bin/release")
         buildpack_refresh.logger = Pkgr.logger
         buildpack_refresh.run_command
         buildpack_refresh.error!
@@ -117,6 +123,21 @@ module Pkgr
 
   private
 
+    def ref_for_checkout
+      [
+        "refs/remotes/origin/#{branch}",
+        "refs/tags/#{branch}",
+        "refs/heads/#{branch}"
+      ].find { |ref| git_ref_exists?(ref) } || branch
+    end
+
+    def git_ref_exists?(ref)
+      git_ref = Mixlib::ShellOut.new("git rev-parse --verify --quiet #{Shellwords.shellescape(ref)}")
+      git_ref.logger = Pkgr.logger
+      git_ref.run_command
+      git_ref.exitstatus == 0
+    end
+
     def compound_environment(path, local_env = Env.new)
       Env.new(['PATH=$PATH']).merge(local_env).merge(env).merge(exported_environment(File.join(path, "export")))
     end

data/lib/pkgr/config.rb

@@ -27,6 +27,12 @@ module Pkgr
           end
         end
 
+        # Check if targets are defined but current target is not
+        if !targets.empty? && !targets.has_key?(distribution.to_s)
+          available_targets = targets.keys.join(", ")
+          raise Pkgr::Errors::TargetNotDefined, "Target '#{distribution}' is not defined in .pkgr.yml. Available targets: #{available_targets}"
+        end
+
         distro_config = targets[distribution.to_s]
         if distro_config.is_a?(Hash)
           distro_config.each do |k,v|
@@ -133,13 +139,18 @@ module Pkgr
     end
 
     def env
-      @table[:env].is_a?(Pkgr::Env) ? @table[:env] : Pkgr::Env.new(@table[:env])
+      @env ||= @table[:env].is_a?(Pkgr::Env) ? @table[:env] : Pkgr::Env.new(@table[:env])
     end
 
     def buildpacks
       @table[:buildpack].is_a?(String) ? @table[:buildpack].split(",") : @table[:buildpack]
     end
 
+    def name
+      # handle GITHUB_REPOSITORY-like names
+      (@table[:name] || "").split("/").last
+    end
+
     def valid?
       @errors = []
       @errors.push("name can't be blank") if name.nil? || name.empty?

data/lib/pkgr/cron.rb

@@ -1,6 +1,6 @@
 module Pkgr
   class Cron
-    # the source, in /opt/app-name/...
+    # the source, in /usr/share/app-name/crons/...
     attr_reader :source
     # the destination, most likely in /etc/cron.d/...
     attr_reader :destination

data/lib/pkgr/distributions/amazon.rb

@@ -1,8 +1,9 @@
 module Pkgr
-
   module Distributions
-
     class Amazon < Base
+      def rpm?
+        true
+      end
 
       def release
         @release[/^[0-9]+/]
@@ -35,9 +36,6 @@ module Pkgr
           list
         end
       end
-
     end
-
   end
-
 end

data/lib/pkgr/distributions/base.rb

@@ -22,17 +22,21 @@ module Pkgr
         self.class.name.split("::")[-1].downcase
       end # def os
 
+      def rpm?
+        false
+      end
+
+      def deb?
+        false
+      end
+
       # e.g. ubuntu-12.04
       def slug
         [os, release].join("-")
       end # def slug
 
       def target
-        {
-          "centos-6" => "el:6",
-          "centos-7" => "el:7",
-          "centos-8" => "el:8"
-        }.fetch(slug, slug.sub("-", ":"))
+        slug.sub("-", ":").sub("centos", "el")
       end
 
       def package_test_command(package)
@@ -123,6 +127,13 @@ module Pkgr
         list
       end
 
+      def config_files
+        templates
+          .filter { |template| template.is_a?(Templates::FileTemplate) }
+          .map(&:target)
+          .filter { |target| target.start_with?("etc/") }
+      end
+
       # Returns a list of <Process, FileTemplate> tuples.
       def initializers_for(app_name, procfile_entries)
         list = []

data/lib/pkgr/distributions/debian.rb

@@ -7,6 +7,10 @@ module Pkgr
   module Distributions
     # Contains the various components required to make a packaged app integrate well with a Debian system.
     class Debian < Base
+      def deb?
+        true
+      end
+
       # Only keep major digits
       def release
         @release[/^[0-9]+/]
@@ -14,10 +18,10 @@ module Pkgr
 
       def runner
         @runner ||= case release
-        when /^8/, /^9/, /^10/
-          Runner.new("systemd", "default", "systemctl")
-        else
+        when /^6/, /^7/
           Runner.new("sysv", "lsb-3.1", "update-rc.d")
+        else
+          Runner.new("systemd", "default", "systemctl")
         end
       end
 
@@ -41,7 +45,7 @@ module Pkgr
         Dir.glob(File.join(output_dir, "*deb")).each do |package|
           puts "-----> Verifying package #{File.basename(package)}"
           Dir.mktmpdir do |dir|
-            verify_package = Mixlib::ShellOut.new %{dpkg-deb -x #{package} #{dir}}
+            verify_package = Mixlib::ShellOut.new %{dpkg-deb -x "#{package}" "#{dir}"}
             verify_package.logger = Pkgr.logger
             verify_package.run_command
             verify_package.error!

data/lib/pkgr/distributions/fedora.rb

@@ -7,6 +7,10 @@ module Pkgr
   module Distributions
     # Contains the various components required to make a packaged app integrate well with a Debian system.
     class Fedora < Base
+      def rpm?
+        true
+      end
+
       # Only keep major digits
       def release
         @release[/^[0-9]+/]

data/lib/pkgr/distributions/redhat.rb

@@ -20,7 +20,6 @@ module Pkgr
           super
         end
       end
-
     end
   end
 end

data/lib/pkgr/distributions/sles.rb

@@ -6,13 +6,21 @@ require 'pkgr/fpm_command'
 module Pkgr
   module Distributions
     class Sles < Base
+      def rpm?
+        true
+      end
+
       # Only keep major digits
       def release
         @release[/^[0-9]+/]
       end
 
       def runner
-        @runner ||= Runner.new("sysv", "lsb-3.1", "chkconfig")
+        @runner ||= if release.to_i > 12
+          Runner.new("systemd", "default", "systemctl")
+        else
+          Runner.new("sysv", "lsb-3.1", "chkconfig")
+        end
       end
 
       def package_test_command(package)
@@ -20,7 +28,12 @@ module Pkgr
       end
 
       def package_install_command(packages)
-        "sudo zypper refresh ; sudo zypper install -y #{packages.map{|package| "\"#{package}\""}.join(" ")}"
+        # --no-gpg-checks helps with outdated repos for SLES
+        zypper_flags = []
+        if release.to_i <= 12
+          zypper_flags.push("--no-gpg-checks")
+        end
+        "sudo zypper refresh ; sudo zypper #{zypper_flags.join(" ")} install -y #{packages.map{|package| "\"#{package}\""}.join(" ")}"
       end
 
       def installer_dependencies

data/lib/pkgr/env.rb

@@ -9,8 +9,7 @@ module Pkgr
     end
 
     def initialize(variables = nil)
-      @variables = variables || []
-      @variables.compact!
+      @variables = (variables || []).map{|v| v && v.split("\n")}.flatten.select{|v| v && v.length > 0}
     end
 
     def to_s
@@ -35,7 +34,9 @@ module Pkgr
 
       variables.inject({}) do |h, var|
         name, value = var.split('=', 2)
-        h[name.strip] = EnvValue.new(value || "").strip.unquote
+        unless name.nil?
+          h[name.strip] = EnvValue.new(value || "").strip.unquote
+        end
         h
       end
     end

data/lib/pkgr/env_value.rb

@@ -37,6 +37,10 @@ class EnvValue < String
     "#{f}#{self}#{b}"
   end
 
+  def strip
+    self.class.new(super)
+  end
+
   def unquote
     s = self.dup
 

data/lib/pkgr/fpm_command.rb

@@ -38,7 +38,9 @@ module Pkgr
       list << "--before-remove" << distribution.preuninstall_file
       list << "--after-remove" << distribution.postuninstall_file
       list << "--directories" << config.directories unless config.directories.nil?
+      list << "--rpm-digest" << "sha256" if distribution.rpm?
       distribution.dependencies(config.dependencies).each{|d| list << "-d" << d}
+      distribution.config_files.each{|f| list << "--config-files" << f}
       list.compact
     end
   end

data/lib/pkgr/version.rb

@@ -1,3 +1,3 @@
 module Pkgr
-  VERSION = "1.8.0"
+  VERSION = "1.9.1"
 end

data/lib/pkgr.rb

@@ -2,6 +2,14 @@ require 'pkgr/version'
 require 'pkgr/cli'
 require 'pkgr/dispatcher'
 require 'mixlib/log'
+require 'yaml'
+
+# https://stackoverflow.com/questions/71191685/visit-psych-nodes-alias-unknown-alias-default-psychbadalias/71192990#71192990
+module YAML
+  class << self
+    alias_method :load, :unsafe_load if YAML.respond_to? :unsafe_load
+  end
+end
 
 module Pkgr
   extend Mixlib::Log
@@ -11,6 +19,7 @@ module Pkgr
     class UnknownAppType < Base; end
     class UnknownDistribution < Base; end
     class ConfigurationInvalid < Base; end
+    class TargetNotDefined < Base; end
   end
 
   def data_dir=(path)