conjur-debify 3.0.0 → 3.0.1.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65aa3614580dd66e5394a5e1893f236722b8dbc740d2f1f344df21498dcfa757
-  data.tar.gz: 5af3cebd73f1d05e96c13ead0ea70a6486c4ed6ce5d10860ca6840c80a395217
+  metadata.gz: '096db9519827f8f934db03302c1a7fe2d9110ff93dac1aa2f94a04e5dbab9ba4'
+  data.tar.gz: 2a405f19f456e8930e2f091e6ba78b48ec47156f508a62b4b1997d6046aebcd4
 SHA512:
-  metadata.gz: 43f4c48ac3a1518d967554ea863fc865960a2e6ccac87205935902a80fd37c96140a71cedbeed02bf2608f863f398d2617d2d3e48688a07174adbbcaab913dfe
-  data.tar.gz: 82a7f4e7811b6f02bfd9e0f33b57c0c557e0efca08ec0484477d53bff83747e7957c1bb23d737c519bcbbd29a8c9d842ebe8ee4b1aadce8fd1504618d92b7e90
+  metadata.gz: a6dd0ad08d96af4008a005ccf4341c6b015da2312af99d9b68ca15fa8e359ccabd9a5733c68e99137a7a9d198730cc98626cf261f4509054be7f00d23fa9cbb3
+  data.tar.gz: de9b43db5db76a000eac7858d79ec1e3caee868b0152ef264032c875e17d4ef7e30508dc3ce349636c5db70ef9edb818a20c7b4184dda0c03e2b1d8c7f5fe1d5

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [3.0.1]
+### Changed
+
+- Supply debian distribution to fpm
+
+### Fixed
+
+- Fixed publish-rubygems.sh by using git safe directory
+
 ## [3.0.0]
 ### Changed
 

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1-2

data/ci/test.sh

@@ -1,5 +1,7 @@
 #!/bin/bash -ex
 
+git config --global --add safe.directory "$PWD"
+
 bundle
 
 for target in spec cucumber; do

data/distrib/entrypoint.sh

@@ -15,5 +15,9 @@ if [[ ${#creds[*]} > 0 ]]; then
   echo -n "${creds[1]}" | docker login registry.tld -u ${creds[0]} --password-stdin >/dev/null 2>&1
 fi
 
+# Ensure the current working directory is considered safe by git in the debify
+# container.
+git config --global --add safe.directory "$PWD"
+
 exec debify "$@"
 

data/lib/conjur/debify.rb

@@ -540,6 +540,7 @@ RUN touch /etc/service/conjur/down
       FileUtils.mkdir_p dot_bundle_dir
       options = {
         'Image' => appliance_image.id,
+        'name' => project_name,
         'Env' => [
           "CONJUR_AUTHN_LOGIN=admin",
           "CONJUR_ENV=appliance",

data/lib/conjur/fpm/package.sh

@@ -64,6 +64,7 @@ else
     --license "Proprietary" \
     --url "https://www.cyberark.com" \
     --deb-no-default-config-files \
+    --deb-dist "whatever" \
     --$file_type-user conjur \
     --$file_type-group conjur \
     --depends "conjur-$project_name = $version" \
@@ -99,6 +100,7 @@ fpm \
   --url "https://www.cyberark.com" \
   --config-files opt/conjur/etc \
   --deb-no-default-config-files \
+  --deb-dist "whatever" \
   --$file_type-user conjur \
   --$file_type-group conjur \
   --description "Conjur $project_name service" \

data/publish-rubygem.sh

@@ -1,10 +1,12 @@
 #!/usr/bin/env bash
 set -e
 
-docker run -i --rm -v $PWD:/src -w /src alpine/git clean -fxd \
-  -e VERSION \
-  -e bom-assets/ \
-  -e release-assets/
+docker run -i --rm -v $PWD:/src -w /src --entrypoint /bin/sh alpine/git \
+  -c "git config --global --add safe.directory /src && \
+      git clean -fdx \
+        -e VERSION \
+        -e bom-assets/ \
+        -e release-assets"
 
 summon --yaml "RUBYGEMS_API_KEY: !var rubygems/api-key" \
   publish-rubygem debify

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1.pre.2
 platform: ruby
 authors:
 - CyberArk Software, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -246,11 +246,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Utility commands to build and package Conjur services as Debian packages