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

build: fix documentation on updating the builder image given #56987 #59861

Merged
merged 1 commit into from
Feb 16, 2021

Conversation

rickystewart
Copy link
Collaborator

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@rickystewart rickystewart changed the title build: fix documentation on updating the build image given #56987 build: fix documentation on updating the builder image given #56987 Feb 5, 2021
build/README.md Outdated Show resolved Hide resolved
build/README.md Outdated

### Using TeamCity to build and deploy

- Edit `build/builder/Dockerfile` as desired and commit your changes.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Heh. I didn't do a good enough job describing what I was thinking. How about a change like this to the first text you had put in (with only one way of pushing the image to docker hub via the TC build configuration).

Suggested change
- Edit `build/builder/Dockerfile` as desired and commit your changes.
- Edit `build/builder/Dockerfile` as desired
- Run `build/builder.sh init` to test -- this will build the image locally. Beware this can take a lot of time. The result of `init` is a docker image version which you can subsequently stick into the `version` variable inside the `builder.sh` script for testing locally.
- Commit your changes once you are happy with the result.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I think that this is more or less what you meant? Let me know.

Copy link
Collaborator

@jlinder jlinder left a comment

Choose a reason for hiding this comment

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

Sweet. Looks great. Thank you!

@rickystewart
Copy link
Collaborator Author

bors r+

@craig
Copy link
Contributor

craig bot commented Feb 16, 2021

Build succeeded:

@craig craig bot merged commit 45db472 into cockroachdb:master Feb 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants