Skip to content
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.

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

bump bosh cli and go #16

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions .github/workflows/build-concourse-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ jobs:

-
name: build and publish 'buildpack' image
uses: docker/build-push-action@v5.1.0
uses: docker/build-push-action@v6.7.0
with:
context: buildpack-image
#context: buildpack-image
file: buildpack-image/Dockerfile
push: true
tags: |
ghcr.io/${{github.repository}}:${{github.sha}}
Expand Down
6 changes: 4 additions & 2 deletions buildpack-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ruby:3.0-slim

ARG BOSH_CLI_VERSION="7.2.0"
ARG BOSH_CLI_VERSION="7.7.0"

ENV PACKAGES "bash curl openssh-client file git openssl ca-certificates wget libffi-dev zip gcc ruby-dev make"

Expand All @@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y $PACKAGES && rm -rf /var/lib/apt/lists/

RUN curl -L 'https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64' -o /usr/local/bin/jq && chmod +x /usr/local/bin/jq

RUN curl -L 'https://dl.google.com/go/go1.20.2.linux-amd64.tar.gz' -o go.tar.gz && tar -C /usr/local -xzf go.tar.gz && rm -f go.tar.gz
RUN curl -L 'https://dl.google.com/go/go1.22.5.linux-amd64.tar.gz' -o go.tar.gz && tar -C /usr/local -xzf go.tar.gz && rm -f go.tar.gz

RUN curl -L "https://s3.amazonaws.com/bosh-cli-artifacts/bosh-cli-${BOSH_CLI_VERSION}-linux-amd64" -o /usr/local/bin/bosh \
&& chmod +x /usr/local/bin/bosh
Expand All @@ -19,3 +19,5 @@ RUN mkdir -p /gopath/bin
ENV GOPATH /gopath
ENV GOBIN /gopath/bin
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin

ADD ../scripts ci-scripts/scripts
5 changes: 0 additions & 5 deletions operators/add-trigger-all-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,9 @@
- put: fly
params:
options: |
trigger-job -j $BUILD_PIPELINE_NAME/deploy-php
trigger-job -j $BUILD_PIPELINE_NAME/deploy-go
trigger-job -j $BUILD_PIPELINE_NAME/deploy-ruby
trigger-job -j $BUILD_PIPELINE_NAME/deploy-python
trigger-job -j $BUILD_PIPELINE_NAME/deploy-binary
trigger-job -j $BUILD_PIPELINE_NAME/deploy-staticfile
trigger-job -j $BUILD_PIPELINE_NAME/deploy-java
trigger-job -j $BUILD_PIPELINE_NAME/deploy-nodejs

- type: replace
path: /groups/name=all/jobs/-
Expand Down
39 changes: 2 additions & 37 deletions operators/custom-s3.yml
Original file line number Diff line number Diff line change
@@ -1,53 +1,18 @@
- type: replace
path: /resources/name=php-buildpack-store/source/endpoint?
value: ((s3_endpoint))
- type: replace
path: /resources/name=php-buildpack-cflinuxfs3-store/source/endpoint?
value: ((s3_endpoint))

- type: replace
path: /resources/name=go-buildpack-store/source/endpoint?
value: ((s3_endpoint))
- type: replace
path: /resources/name=go-buildpack-cflinuxfs3-store/source/endpoint?
value: ((s3_endpoint))

- type: replace
path: /resources/name=ruby-buildpack-store/source/endpoint?
value: ((s3_endpoint))
- type: replace
path: /resources/name=ruby-buildpack-cflinuxfs3-store/source/endpoint?
value: ((s3_endpoint))

- type: replace
path: /resources/name=python-buildpack-store/source/endpoint?
value: ((s3_endpoint))
- type: replace
path: /resources/name=python-buildpack-cflinuxfs3-store/source/endpoint?
path: /resources/name=ruby-buildpack-cflinuxfs4-store/source/endpoint?
value: ((s3_endpoint))

- type: replace
path: /resources/name=binary-buildpack-store/source/endpoint?
value: ((s3_endpoint))
- type: replace
path: /resources/name=binary-buildpack-cflinuxfs3-store/source/endpoint?
value: ((s3_endpoint))

- type: replace
path: /resources/name=staticfile-buildpack-store/source/endpoint?
value: ((s3_endpoint))
- type: replace
path: /resources/name=staticfile-buildpack-cflinuxfs3-store/source/endpoint?
path: /resources/name=binary-buildpack-cflinuxfs4-store/source/endpoint?
value: ((s3_endpoint))

- type: replace
path: /resources/name=java-buildpack-store/source/endpoint?
value: ((s3_endpoint))

- type: replace
path: /resources/name=nodejs-buildpack-store/source/endpoint?
value: ((s3_endpoint))
- type: replace
path: /resources/name=nodejs-buildpack-cflinuxfs3-store/source/endpoint?
value: ((s3_endpoint))

5 changes: 0 additions & 5 deletions operators/detect-previous-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,9 @@
- put: fly
params:
options: |
check-resource -r $BUILD_PIPELINE_NAME/php-bp-release --from ref:v((php-buildpack-version))
check-resource -r $BUILD_PIPELINE_NAME/go-bp-release --from ref:v((go-buildpack-version))
check-resource -r $BUILD_PIPELINE_NAME/ruby-bp-release --from ref:v((ruby-buildpack-version))
check-resource -r $BUILD_PIPELINE_NAME/python-bp-release --from ref:v((python-buildpack-version))
check-resource -r $BUILD_PIPELINE_NAME/binary-bp-release --from ref:v((binary-buildpack-version))
check-resource -r $BUILD_PIPELINE_NAME/staticfile-bp-release --from ref:v((staticfile-buildpack-version))
check-resource -r $BUILD_PIPELINE_NAME/java-bp-release --from ref:v((java-buildpack-version))
check-resource -r $BUILD_PIPELINE_NAME/nodejs-bp-release --from ref:v((nodejs-buildpack-version))

- type: replace
path: /groups/name=all/jobs/-
Expand Down
Loading