Merge pull request #119 from jspaleta/fix/asset-enablement

Fix/asset enablement

Author: Todd Campbell

.bonsai.yml

@@ -1,22 +1,23 @@
 ---
 description: "#{repo}"
 builds:
-- platform: "debian"
+- platform: "alpine"
   arch: "amd64"
-  asset_filename: "#{repo}_#{version}_debian_linux_amd64.tar.gz"
+  asset_filename: "#{repo}_#{version}_alpine_linux_amd64.tar.gz"
   sha_filename: "#{repo}_#{version}_sha512-checksums.txt"
   filter:
   -  "entity.system.os == 'linux'"
   -  "entity.system.arch == 'amd64'"
-  -  "entity.system.platform_family == 'debian'"
-- platform: "centos"
+  -  "entity.system.platform == 'alpine'"
+  -  "entity.system.platform_version.split('.')[0] == '3'"
+- platform: "alpine3.8"
   arch: "amd64"
-  asset_filename: "#{repo}_#{version}_centos_linux_amd64.tar.gz"
+  asset_filename: "#{repo}_#{version}_alpine3.8_linux_amd64.tar.gz"
   sha_filename: "#{repo}_#{version}_sha512-checksums.txt"
   filter:
   -  "entity.system.os == 'linux'"
   -  "entity.system.arch == 'amd64'"
-  -  "entity.system.platform_family == 'rhel'"
+  -  "entity.system.platform == 'alpine'"
 - platform: "centos6"
   arch: "amd64"
   asset_filename: "#{repo}_#{version}_centos6_linux_amd64.tar.gz"
@@ -25,7 +26,7 @@ builds:
   -  "entity.system.os == 'linux'"
   -  "entity.system.arch == 'amd64'"
   -  "entity.system.platform_family == 'rhel'"
-  -  "parseInt(entity.system.platform_version.split('.')[0]) > 6"
+  -  "entity.system.platform_version.split('.')[0] == '6'"
 - platform: "centos7"
   arch: "amd64"
   asset_filename: "#{repo}_#{version}_centos7_linux_amd64.tar.gz"
@@ -34,4 +35,19 @@ builds:
   -  "entity.system.os == 'linux'"
   -  "entity.system.arch == 'amd64'"
   -  "entity.system.platform_family == 'rhel'"
-  -  "parseInt(entity.system.platform_version.split('.')[0]) > 7"
+  -  "entity.system.platform_version.split('.')[0] == '7'"
+- platform: "debian"
+  arch: "amd64"
+  asset_filename: "#{repo}_#{version}_debian_linux_amd64.tar.gz"
+  sha_filename: "#{repo}_#{version}_sha512-checksums.txt"
+  filter:
+  -  "entity.system.os == 'linux'"
+  -  "entity.system.arch == 'amd64'"
+  -  "entity.system.platform_family == 'debian'"
+- platform: "debian9"
+  arch: "amd64"
+  asset_filename: "#{repo}_#{version}_debian9_linux_amd64.tar.gz"
+  sha_filename: "#{repo}_#{version}_sha512-checksums.txt"
+  filter:
+  -  "entity.system.os == 'linux'"
+  -  "entity.system.arch == 'amd64'"

asset_build_scripts/Dockerfile.alpine

@@ -2,13 +2,21 @@ FROM sensu/sensu-ruby-runtime-2.4.4-alpine:latest as builder
 ARG ASSET_GEM
 ARG GIT_REF
 ARG GIT_REPO
+ARG RUBY_VERSION=2.4.4
+
 WORKDIR /assets/build/
+RUN apk del openssl-dev
 RUN apk add git
-RUN apk add postgresql-client postgresql-dev
+RUN apk add libressl-dev postgresql-client postgresql-dev
 RUN \
   gem install --no-ri --no-doc bundler && \
   printf "source 'https://rubygems.org'\n\ngem \"%s\", :git => \"%s\" , :ref => \"%s\"\n" ${ASSET_GEM} ${GIT_REPO} ${GIT_REF}| tee Gemfile 
 RUN bundle install --path=lib/ --binstubs=bin/ --standalone
+
+RUN LIBS=$(find ./ -type f -exec ldd {} 2>/dev/null \;|  grep "=>" | grep -v "vdso.so.1" | awk '{print $3}'| sort -u ) && \
+  for f in $LIBS; do if [ -e $f ] && [ ! -e /opt/rubies/ruby-${RUBY_VERSION}/lib/$f ] ; then echo "Copying Library: $f" && cp $f ./lib/; fi; done
+
+
 RUN tar -czf /assets/${ASSET_GEM}.tar.gz -C /assets/build/ .
 
 FROM scratch

asset_build_scripts/Dockerfile.alpine3.8

@@ -2,13 +2,20 @@ FROM sensu/sensu-ruby-runtime-2.4.4-alpine3.8:latest as builder
 ARG ASSET_GEM
 ARG GIT_REF
 ARG GIT_REPO
+ARG RUBY_VERSION=2.4.4
+
 WORKDIR /assets/build/
+RUN apk del openssl-dev
 RUN apk add git
-RUN apk add postgresql-client postgresql-dev
+RUN apk add libressl-dev postgresql-client postgresql-dev
 RUN \
   gem install --no-ri --no-doc bundler && \
   printf "source 'https://rubygems.org'\n\ngem \"%s\", :git => \"%s\" , :ref => \"%s\"\n" ${ASSET_GEM} ${GIT_REPO} ${GIT_REF}| tee Gemfile 
 RUN bundle install --path=lib/ --binstubs=bin/ --standalone
+
+RUN LIBS=$(find ./ -type f -exec ldd {} 2>/dev/null \;|  grep "=>" | grep -v "vdso.so.1" | awk '{print $3}'| sort -u ) && \
+  for f in $LIBS; do if [ -e $f ] && [ ! -e /opt/rubies/ruby-${RUBY_VERSION}/lib/$f ] ; then echo "Copying Library: $f" && cp $f ./lib/; fi; done
+
 RUN tar -czf /assets/${ASSET_GEM}.tar.gz -C /assets/build/ .
 
 FROM scratch

asset_build_scripts/Dockerfile.centos

@@ -2,6 +2,9 @@ FROM sensu/sensu-ruby-runtime-2.4.4-centos:latest as builder
 ARG ASSET_GEM
 ARG GIT_REF
 ARG GIT_REPO
+ARG GREP_EXCLUDE='(ld.so|ld-linux-x86-64.so|libBrokenLocale.so|libSegFault.so|libanl.so|libc.so|libdl.so|libm.so|libmvec.so|libnss_compat.so|libnss_dns.so|libnss_files.so|libpthread.so|libresolv.so|librt.so|libthread_db.so|libutil.so|vdso.so)'
+ARG RUBY_VERSION=2.4.4
+
 WORKDIR /assets/build/
 RUN yum install -y git 
 RUN yum install -y http://yum.postgresql.org/9.5/redhat/rhel-7-x86_64/pgdg-redhat95-9.5-3.noarch.rpm
@@ -11,6 +14,10 @@ RUN \
   gem install --no-ri --no-doc bundler && \
   printf "source 'https://rubygems.org'\n\ngem \"%s\", :git => \"%s\" , :ref => \"%s\"\n" ${ASSET_GEM} ${GIT_REPO} ${GIT_REF}| tee Gemfile 
 RUN bundle install --path=lib/ --binstubs=bin/ --standalone
+
+RUN LIBS=$(find ./ -type f -executable -exec ldd {} 2>/dev/null \;|  grep "=>" | egrep -v ${GREP_EXCLUDE} | awk '{print $3}'| sort -u ) && \
+  for f in $LIBS; do if [ -e $f ] && [ ! -e /opt/rubies/ruby-${RUBY_VERSION}/lib/$f ] ; then echo "Copying Library: $f" && cp $f ./lib/; fi; done
+
 RUN tar -czf /assets/${ASSET_GEM}.tar.gz -C /assets/build/ .
 
 FROM scratch

asset_build_scripts/Dockerfile.centos6

@@ -2,6 +2,9 @@ FROM sensu/sensu-ruby-runtime-2.4.4-centos6:latest as builder
 ARG ASSET_GEM
 ARG GIT_REF
 ARG GIT_REPO
+ARG GREP_EXCLUDE='(ld.so|ld-linux-x86-64.so|libBrokenLocale.so|libSegFault.so|libanl.so|libc.so|libdl.so|libm.so|libmvec.so|libnss_compat.so|libnss_dns.so|libnss_files.so|libpthread.so|libresolv.so|librt.so|libthread_db.so|libutil.so|vdso.so)'
+ARG RUBY_VERSION=2.4.4
+
 WORKDIR /assets/build/
 RUN yum install -y git 
 RUN yum install -y http://yum.postgresql.org/9.5/redhat/rhel-6-x86_64/pgdg-redhat95-9.5-3.noarch.rpm
@@ -11,6 +14,10 @@ RUN \
   gem install --no-ri --no-doc bundler && \
   printf "source 'https://rubygems.org'\n\ngem \"%s\", :git => \"%s\" , :ref => \"%s\"\n" ${ASSET_GEM} ${GIT_REPO} ${GIT_REF}| tee Gemfile 
 RUN bundle install --path=lib/ --binstubs=bin/ --standalone
+
+RUN LIBS=$(find ./ -type f -executable -exec ldd {} 2>/dev/null \;|  grep "=>" | egrep -v ${GREP_EXCLUDE} | awk '{print $3}'| sort -u ) && \
+  for f in $LIBS; do if [ -e $f ] && [ ! -e /opt/rubies/ruby-${RUBY_VERSION}/lib/$f ] ; then echo "Copying Library: $f" && cp $f ./lib/; fi; done
+
 RUN tar -czf /assets/${ASSET_GEM}.tar.gz -C /assets/build/ .
 
 FROM scratch

asset_build_scripts/Dockerfile.centos7

@@ -2,6 +2,9 @@ FROM sensu/sensu-ruby-runtime-2.4.4-centos7:latest as builder
 ARG ASSET_GEM
 ARG GIT_REF
 ARG GIT_REPO
+ARG GREP_EXCLUDE='(ld.so|ld-linux-x86-64.so|libBrokenLocale.so|libSegFault.so|libanl.so|libc.so|libdl.so|libm.so|libmvec.so|libnss_compat.so|libnss_dns.so|libnss_files.so|libpthread.so|libresolv.so|librt.so|libthread_db.so|libutil.so|vdso.so)'
+ARG RUBY_VERSION=2.4.4
+
 WORKDIR /assets/build/
 RUN yum install -y git 
 RUN yum install -y http://yum.postgresql.org/9.5/redhat/rhel-7-x86_64/pgdg-redhat95-9.5-3.noarch.rpm
@@ -11,6 +14,10 @@ RUN \
   gem install --no-ri --no-doc bundler && \
   printf "source 'https://rubygems.org'\n\ngem \"%s\", :git => \"%s\" , :ref => \"%s\"\n" ${ASSET_GEM} ${GIT_REPO} ${GIT_REF}| tee Gemfile 
 RUN bundle install --path=lib/ --binstubs=bin/ --standalone
+
+RUN LIBS=$(find ./ -type f -executable -exec ldd {} 2>/dev/null \;|  grep "=>" | egrep -v ${GREP_EXCLUDE} | awk '{print $3}'| sort -u ) && \
+  for f in $LIBS; do if [ -e $f ] && [ ! -e /opt/rubies/ruby-${RUBY_VERSION}/lib/$f ] ; then echo "Copying Library: $f" && cp $f ./lib/; fi; done
+
 RUN tar -czf /assets/${ASSET_GEM}.tar.gz -C /assets/build/ .
 
 FROM scratch

asset_build_scripts/Dockerfile.debian

@@ -2,13 +2,20 @@ FROM sensu/sensu-ruby-runtime-2.4.4-debian:latest as builder
 ARG ASSET_GEM
 ARG GIT_REF
 ARG GIT_REPO
+ARG GREP_EXCLUDE='(ld.so|ld-linux-x86-64.so|libBrokenLocale.so|libSegFault.so|libanl.so|libc.so|libdl.so|libm.so|libmvec.so|libnss_compat.so|libnss_dns.so|libnss_files.so|libpthread.so|libresolv.so|librt.so|libthread_db.so|libutil.so|vdso.so)'
+ARG RUBY_VERSION=2.4.4
+
 WORKDIR /assets/build/
 RUN apt-get update && apt-get install -y git 
 RUN apt-get install -y libpq-dev
 RUN \
   gem install --no-ri --no-doc bundler && \
   printf "source 'https://rubygems.org'\n\ngem \"%s\", :git => \"%s\" , :ref => \"%s\"\n" ${ASSET_GEM} ${GIT_REPO} ${GIT_REF}| tee Gemfile 
 RUN bundle install --path=lib/ --binstubs=bin/ --standalone
+
+RUN LIBS=$(find ./ -type f -executable -exec ldd {} 2>/dev/null \;|  grep "=>" | egrep -v ${GREP_EXCLUDE} | awk '{print $3}'| sort -u ) && \
+  for f in $LIBS; do if [ -e $f ] && [ ! -e /opt/rubies/ruby-${RUBY_VERSION}/lib/$f ] ; then echo "Copying Library: $f" && cp $f ./lib/; fi; done
+
 RUN tar -czf /assets/${ASSET_GEM}.tar.gz -C /assets/build/ .
 
 FROM scratch

asset_build_scripts/Dockerfile.debian9

@@ -2,13 +2,20 @@ FROM sensu/sensu-ruby-runtime-2.4.4-debian9:latest as builder
 ARG ASSET_GEM
 ARG GIT_REF
 ARG GIT_REPO
+ARG GREP_EXCLUDE='(ld.so|ld-linux-x86-64.so|libBrokenLocale.so|libSegFault.so|libanl.so|libc.so|libdl.so|libm.so|libmvec.so|libnss_compat.so|libnss_dns.so|libnss_files.so|libpthread.so|libresolv.so|librt.so|libthread_db.so|libutil.so|vdso.so)'
+ARG RUBY_VERSION=2.4.4
+
 WORKDIR /assets/build/
 RUN apt-get update && apt-get install -y git
 RUN apt-get install -y libpq-dev
 RUN \
   gem install --no-ri --no-doc bundler && \
   printf "source 'https://rubygems.org'\n\ngem \"%s\", :git => \"%s\" , :ref => \"%s\"\n" ${ASSET_GEM} ${GIT_REPO} ${GIT_REF}| tee Gemfile 
 RUN bundle install --path=lib/ --binstubs=bin/ --standalone
+
+RUN LIBS=$(find ./ -type f -executable -exec ldd {} 2>/dev/null \;|  grep "=>" | egrep -v ${GREP_EXCLUDE} | awk '{print $3}'| sort -u ) && \
+  for f in $LIBS; do if [ -e $f ] && [ ! -e /opt/rubies/ruby-${RUBY_VERSION}/lib/$f ] ; then echo "Copying Library: $f" && cp $f ./lib/; fi; done
+
 RUN tar -czf /assets/${ASSET_GEM}.tar.gz -C /assets/build/ .
 
 FROM scratch