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

Add develop binary #95

Merged
merged 2 commits into from
Jun 10, 2020
Merged
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
10 changes: 8 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,14 @@ jobs:
- restore_cache:
key: v1-image-{{ .Environment.CIRCLE_SHA1 }}-pack-18-run.tar
- setup_remote_docker
- run: docker load < pack-18-build.tar
- run: docker load < pack-18-riff-build.tar
- run: |
if [ -f "pack-18-build.tar" ]; then
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI: The riff-build additional image caused this to fail on fresh branch builds. This will go away in a followup pr as we no longer need the riff-build image at all.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jabrown85 does this mean the RIFF=1 is no longer required?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct. In the next PR I'll get rid of it.

docker load < pack-18-build.tar
fi
- run: |
if [ -f "pack-18-riff-build.tar" ]; then
docker load < pack-18-riff-build.tar
fi
- run: docker load < pack-18-run.tar
- run: pack create-builder << parameters.image_tag >> --builder-config << parameters.builder_toml >> --no-pull
- run: docker save << parameters.image_tag >> > << parameters.image_file >>
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile.build
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ ENV CNB_GROUP_ID=${pack_gid}
ENV STACK "heroku-18"
ENV CNB_STACK_ID "heroku-18"
LABEL io.buildpacks.stack.id="heroku-18"

ADD https://s3.amazonaws.com/heroku-fn-devex-staging/develop/latest/develop /cnb/lifecycle/develop
RUN chmod +x /cnb/lifecycle/develop

USER heroku

FROM build AS riff-build
Expand Down