bosh-gen 0.100.0 → 0.101.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d062566b9b0850bc0d26317746e952bbd28d3d38506cf9632e8707f185a2680
-  data.tar.gz: 7d0db77312618f805f71bfe29cc07c34b6b39c0d92adda337698d8af4557e57b
+  metadata.gz: 2b78a94705fa08c3bf3fdf40185d6337754d8a5d35d18a4e0e9fb3afcff9f7ff
+  data.tar.gz: 7b90bac834ecee203a1f81c68e80a2e9280016fb22993c877b2a3e5250d01008
 SHA512:
-  metadata.gz: 1de50c9609a17a30cfbbf2f19438000fc72ff9120f53cc986a3ff5f503b4c7981a84afc939901753c693badd08c401e2f0e95abb4a949b2c88b109a85696f32f
-  data.tar.gz: 8e512697f3822f1789326988b45a3b4468d66a0e3fdd77bc6e2071c0b521472d7bca7836c3803453da70ee6e55dc4ef3744778cb08964fa4b116fc4a7f2b4a3c
+  metadata.gz: 1bb8f1c5c0ac93c85710675f3322415233cb99cdb4ba94fba36ca98ed69464e5000c3d3e9e34e67c8c8a4f87094874da5a3eac818492fc027a6fad7c5c625ee1
+  data.tar.gz: a020deced1a75cc829af9f337251a66dd8e9a37e03148b86609ecfb1bba8de8ad2d520c549bee9db008fab1b0795afdc2e3ed72879edc1b411429345519d3bc3

data/lib/bosh/gen/generators/blacksmith_forge_generator/templates/jobs/%job_name%/templates/plans/standalone/manifest.yml.tt

@@ -1,7 +1,7 @@
 ---
 stemcells:
 - alias: default
-  os: ubuntu-trusty
+  os: ubuntu-xenial
   version: latest
 
 update:

data/lib/bosh/gen/generators/package_apt_generator.rb

@@ -33,55 +33,15 @@ module Bosh::Gen
       end
 
       def packaging
-        create_file package_dir("packaging") do
-          <<-SHELL.gsub(/^\s{10}/, '')
-          set -e # exit immediately if a simple command exits with a non-zero status
-          set -u # report the usage of uninitialized variables
-          
-          # Available variables
-          # $BOSH_COMPILE_TARGET - where this package & spec'd source files are available
-          # $BOSH_INSTALL_TARGET - where you copy/install files to be included in package
-          
-          mkdir -p $BOSH_INSTALL_TARGET/apt
-          
-          for DEB in $(ls -1 apt/#{name}/*.deb); do
-            echo "Installing $(basename $DEB)"
-            dpkg -x $DEB $BOSH_INSTALL_TARGET/apt
-          done
-          
-          cp -a apt/#{name}/profile.sh $BOSH_INSTALL_TARGET/
-          SHELL
-        end
-      end
-
-      def package_specification
-        src_files = ["apt/#{name}/profile.sh", "apt/#{name}/*.deb"]
-        config = { "name" => name, "dependencies" => dependencies, "files" => src_files }
-        create_file package_dir("spec"), YAML.dump(config)
-      end
-
-      def common_helpers
-        directory 'src/apt'
-        chmod 'src/apt/fetch_debs.sh', 0755
-      end
-
-      def vagrantfile
-        copy_file 'Vagrantfile'
+        directory 'packages'
+        directory 'jobs'
       end
 
       def show_instructions
         say "Next steps:", :green
         say <<-README.gsub(/^        /, '')
-          1. Edit src/apt/#{name}/aptfile to specify list of debian packages to install
-          2. Provision vagrant and run script to fetch debian packages:
-
-            vagrant up
-            vagrant ssh -c '/vagrant/src/apt/fetch_debs.sh #{name}'
-            vagrant destroy
-
-          You can search for aptitude debian packages using apt-cache:
-
-            vagrant ssh -c 'apt-cache search #{name} | sort'
+          1. Edit packages/#{name}/packaging to specify list of debian packages to install
+          2. Add "#{name}-pkg-install" job into deployment manifest
         README
       end
 

data/lib/bosh/gen/generators/package_apt_generator/templates/jobs/%name%-pkg-install/spec.tt

@@ -0,0 +1,5 @@
+---
+name: <%= name %>-pkg-install
+packages: ["<%= name %>"]
+templates:
+  bin/pre-start.sh: bin/pre-start

data/lib/bosh/gen/generators/package_apt_generator/templates/jobs/%name%-pkg-install/templates/bin/pre-start.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -x
+cd /var/vcap/packages/<%= name %>/apt/cache/archives
+. install-packages.sh

data/lib/bosh/gen/generators/package_apt_generator/templates/packages/%name%/packaging.tt

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -eux
+
+# SEE BELOW to specify the Debian packages to install
+
+baseDir=$BOSH_INSTALL_TARGET
+cacheDir="$baseDir/apt/cache"
+mkdir -p "$cacheDir"
+
+# https://bugs.launchpad.net/ubuntu/+source/apt/+bug/1577926
+ls -al /tmp
+chmod 1777 /tmp
+
+apt-get install -y apt-transport-https apt-utils
+
+curl -sL https://raw.githubusercontent.com/starkandwayne/homebrew-cf/master/public.key | apt-key add -
+echo "deb http://apt.starkandwayne.com stable main" | tee /etc/apt/sources.list.d/starkandwayne.list
+apt-get update
+apt-get install install-debs-in-order
+
+apt-get update
+
+######################################
+#
+# Add list of packages to install here
+apt-get install -o debug::nolocking=true -o dir::cache=$cacheDir -y -d \
+  <%= deb_package_name %>
+#
+######################################
+
+cd $cacheDir/archives
+install-debs-in-order . > install-packages.sh

data/lib/bosh/gen/generators/package_apt_generator/templates/packages/%name%/spec.tt

@@ -0,0 +1,4 @@
+---
+name: <%= name %>
+dependencies: []
+files: []

data/lib/bosh/gen/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Gen
-    VERSION = "0.100.0"
+    VERSION = "0.101.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-gen
 version: !ruby/object:Gem::Version
-  version: 0.100.0
+  version: 0.101.0
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -206,10 +206,11 @@ files:
 - lib/bosh/gen/generators/new_release_generator/templates/src/.gitkeep
 - lib/bosh/gen/generators/package_apt_generator.rb
 - lib/bosh/gen/generators/package_apt_generator/templates/.gitkeep
-- lib/bosh/gen/generators/package_apt_generator/templates/Vagrantfile
-- lib/bosh/gen/generators/package_apt_generator/templates/src/apt/%name%/aptfile.tt
-- lib/bosh/gen/generators/package_apt_generator/templates/src/apt/%name%/profile.sh.tt
-- lib/bosh/gen/generators/package_apt_generator/templates/src/apt/fetch_debs.sh
+- lib/bosh/gen/generators/package_apt_generator/templates/jobs/%name%-pkg-install/monit
+- lib/bosh/gen/generators/package_apt_generator/templates/jobs/%name%-pkg-install/spec.tt
+- lib/bosh/gen/generators/package_apt_generator/templates/jobs/%name%-pkg-install/templates/bin/pre-start.sh
+- lib/bosh/gen/generators/package_apt_generator/templates/packages/%name%/packaging.tt
+- lib/bosh/gen/generators/package_apt_generator/templates/packages/%name%/spec.tt
 - lib/bosh/gen/generators/package_docker_image_generator.rb
 - lib/bosh/gen/generators/package_docker_image_generator/templates/jobs/%job_name%/monit.tt
 - lib/bosh/gen/generators/package_docker_image_generator/templates/jobs/%job_name%/spec.tt

data/lib/bosh/gen/generators/package_apt_generator/templates/Vagrantfile

@@ -1,13 +0,0 @@
-# Vagrant used to allow non-Ubuntu hosts to execute
-# apt-get commands to fetch debian packages.
-Vagrant.configure('2') do |config|
-
-  config.vm.hostname='boshrelease-builder'
-  config.vm.box = "ubuntu/xenial64"
-
-  # Need NFS enabled, and hence a private network for virtualbox
-  # as discussed in this project's patch
-  # https://github.com/reidab/citizenry/commit/590ca245b9a4fc96c55ab7bc3bbafa38583f8cda
-  config.vm.network "private_network", ip: "192.168.50.5"
-  config.vm.synced_folder ".", "/vagrant", type: "nfs"
-end

data/lib/bosh/gen/generators/package_apt_generator/templates/src/apt/%name%/aptfile.tt

@@ -1 +0,0 @@
-<%= deb_package_name %>

data/lib/bosh/gen/generators/package_apt_generator/templates/src/apt/%name%/profile.sh.tt

@@ -1,5 +0,0 @@
-export PATH="/var/vcap/packages/<%= name %>/apt/usr/bin:$PATH"
-export LD_LIBRARY_PATH="/var/vcap/packages/<%= name %>/apt/usr/lib:${LD_LIBRARY_PATH:-}"
-export INCLUDE_PATH="/var/vcap/packages/<%= name %>/apt/usr/include:${INCLUDE_PATH:-}"
-export CPATH="$INCLUDE_PATH"
-export CPPPATH="$INCLUDE_PATH"

data/lib/bosh/gen/generators/package_apt_generator/templates/src/apt/fetch_debs.sh

@@ -1,70 +0,0 @@
-set -e          # exit immediately if a simple command exits with a non-zero status
-set -u          # report the usage of uninitialized variables
-set -o pipefail # return value of a pipeline is the value of the last (rightmost) command to exit with a non-zero status
-
-# Usage: src/common/fetch_debs.sh postgresql [src/apt/postgresql]
-#
-#   src/common/fetch_debs.sh postgresql
-#   src/common/fetch_debs.sh postgresql src/apt/postgresql
-#
-PACKAGE_NAME=$1
-RELEASE_DIR=${RELEASE_DIR:-/vagrant}
-if [[ "${2:-X}" == "X" ]]; then
-    PACKAGE_SRC_DIR=$RELEASE_DIR/src/apt/$PACKAGE_NAME
-else
-    PACKAGE_SRC_DIR=$RELEASE_DIR/$2
-fi
-APTFILE=$PACKAGE_SRC_DIR/aptfile
-APT_CACHE_DIR="$RELEASE_DIR/tmp/apt/cache/$PACKAGE_NAME"
-APT_STATE_DIR="$RELEASE_DIR/tmp/apt/state"
-BLOBS_DIR=$RELEASE_DIR/blobs/apt/$PACKAGE_NAME
-
-function error() {
-  echo " !     $*" >&2
-  exit 1
-}
-
-function topic() {
-  echo "-----> $*"
-}
-
-function indent() {
-  c='s/^/       /'
-  case $(uname) in
-    Darwin) sed -l "$c";;
-    *)      sed -u "$c";;
-  esac
-}
-
-topic "Environment information"
-echo $0                | indent
-uname -a               | indent
-pwd                    | indent
-
-# Invoke apt-get to ensure it exists
-if [[ "$(which apt-get)X" == "X" ]]; then
-    error "Cannot find apt-get executable. Run this script within a Debian/Ubuntu environment."
-fi
-which apt-get          | indent
-
-echo $APTFILE          | indent
-if [[ ! -f $APTFILE ]]; then
-    error "Missing source file $APTFILE"
-fi
-
-mkdir -p "$APT_CACHE_DIR/archives/partial"
-mkdir -p "$APT_STATE_DIR/lists/partial"
-mkdir -p $BLOBS_DIR
-
-APT_OPTIONS="-o debug::nolocking=true -o dir::cache=$APT_CACHE_DIR -o dir::state=$APT_STATE_DIR"
-
-topic "Updating apt caches"
-apt-get $APT_OPTIONS update | indent
-
-for PACKAGE in $(cat $APTFILE); do
-  topic "Fetching .debs for $PACKAGE"
-  apt-get $APT_OPTIONS -y -d install $PACKAGE | indent
-done
-
-topic "Copying .debs to blobs"
-cp -a $APT_CACHE_DIR/archives/*.deb $BLOBS_DIR/