Skip to content

Cleanup packaging scripts #2782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aramprice merged 5 commits into from
Jul 16, 2026
Merged

Cleanup packaging scripts #2782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00ea290
packaging: copy `.bundle/confg` into package
aramprice Jul 15, 2026
518c73e
packaging: copy w/o verbose flag
aramprice Jul 15, 2026
efa5cc1
packaging: harmonize script; fix shellcheck issues
aramprice Jul 15, 2026
7225dac
packaging: remove json version restriction
aramprice Jul 15, 2026
3664332
packaging: simplify internal gem build code
aramprice Jul 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions packages/director/packaging
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
set -e

mkdir -p ${BOSH_INSTALL_TARGET}/{bin,gem_home}

libpq_dir=/var/vcap/packages/libpq
mysqlclient_dir=/var/vcap/packages/mysql
mkdir -p "${BOSH_INSTALL_TARGET}"/{bin,gem_home}

source /var/vcap/packages/director-ruby-4.0/bosh/compile.env

for gemspec in $( find . -maxdepth 2 -name *.gemspec ); do
gem_name="$( basename "$( dirname "$gemspec" )" )"
gem_spec="$( basename "$gemspec" )"
libpq_dir=/var/vcap/packages/libpq
mysqlclient_dir=/var/vcap/packages/mysql

pushd "$gem_name"
gem build "$gem_spec"
mv *.gem ../vendor/cache
popd > /dev/null
working_dir="$(pwd)"
for gemspec in ./bosh-*/*.gemspec; do
pushd "$(dirname "${gemspec}")"
gem build
mv ./*.gem "${working_dir}/vendor/cache/"
popd
done
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Comment thread
aramprice marked this conversation as resolved.
Comment thread
coderabbitai[bot] marked this conversation as resolved.

cat > Gemfile <<EOF
# Explicitly require vendored version to avoid requiring builtin json gem
gem 'json', '~>2'

gem 'bosh-director'
gem 'mysql2'
gem 'pg'
Expand All @@ -36,5 +31,4 @@ bundle config set build.pg \
bosh_bundle_local
bosh_generate_runtime_env

cp Gemfile ${BOSH_INSTALL_TARGET}
cp Gemfile.lock ${BOSH_INSTALL_TARGET}
cp -r Gemfile Gemfile.lock .bundle "${BOSH_INSTALL_TARGET}"
25 changes: 10 additions & 15 deletions packages/health_monitor/packaging
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,22 @@
set -e

mkdir -p ${BOSH_INSTALL_TARGET}/{bin,gem_home}
mkdir -p "${BOSH_INSTALL_TARGET}"/{bin,gem_home}

source /var/vcap/packages/director-ruby-4.0/bosh/compile.env

working_dir="$(pwd)"
for gemspec in ./bosh-*/*.gemspec; do
pushd "$(dirname "${gemspec}")"
gem build
mv ./*.gem "${working_dir}/vendor/cache/"
popd
done
Comment thread
aramprice marked this conversation as resolved.

cat > Gemfile <<EOF
# Explicitly require vendored version to avoid requiring builtin json gem
gem 'json', '~>2'
gem 'bosh-monitor'
EOF

for gemspec in $( find . -maxdepth 2 -name *.gemspec ); do
gem_name="$( basename "$( dirname "$gemspec" )" )"
gem_spec="$( basename "$gemspec" )"

pushd "$gem_name"
gem build "$gem_spec"
mv *.gem ../vendor/cache
popd > /dev/null
done

bosh_bundle_local
bosh_generate_runtime_env

cp Gemfile ${BOSH_INSTALL_TARGET}
cp Gemfile.lock ${BOSH_INSTALL_TARGET}
cp -r Gemfile Gemfile.lock .bundle "${BOSH_INSTALL_TARGET}"
36 changes: 14 additions & 22 deletions packages/nats/packaging
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,26 @@
set -e

mkdir -p ${BOSH_INSTALL_TARGET}/bin

tar xzf nats/nats-server-v*-linux-amd64.tar.gz
cp nats-server-v*-linux-amd64/nats-server ${BOSH_INSTALL_TARGET}/bin/nats-server
chmod +x ${BOSH_INSTALL_TARGET}/bin/nats-server


mkdir -p ${BOSH_INSTALL_TARGET}/{bin,gem_home}
mkdir -p "${BOSH_INSTALL_TARGET}"/{bin,gem_home}

source /var/vcap/packages/director-ruby-4.0/bosh/compile.env

tar xzf nats/nats-server-v*-linux-amd64.tar.gz
cp nats-server-v*-linux-amd64/nats-server "${BOSH_INSTALL_TARGET}/bin/nats-server"
chmod +x "${BOSH_INSTALL_TARGET}/bin/nats-server"

working_dir="$(pwd)"
for gemspec in ./bosh-*/*.gemspec; do
pushd "$(dirname "${gemspec}")"
gem build
mv ./*.gem "${working_dir}/vendor/cache/"
popd
done
Comment thread
aramprice marked this conversation as resolved.

cat > Gemfile <<EOF
# Explicitly require vendored version to avoid requiring builtin json gem
gem 'json', '~>2'
gem 'bosh-nats-sync'
EOF

for gemspec in $( find . -maxdepth 2 -name *.gemspec ); do
gem_name="$( basename "$( dirname "$gemspec" )" )"
gem_spec="$( basename "$gemspec" )"

pushd "$gem_name"
gem build "$gem_spec"
mv *.gem ../vendor/cache
popd > /dev/null
done

bosh_bundle_local
bosh_generate_runtime_env

cp Gemfile ${BOSH_INSTALL_TARGET}
cp Gemfile.lock ${BOSH_INSTALL_TARGET}
cp -r Gemfile Gemfile.lock .bundle "${BOSH_INSTALL_TARGET}"
Loading