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.

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

Jump to bottom

Update circleci-docker-primary image to point to most recent #3524

Merged
merged 3 commits into from
Feb 12, 2020
Merged

Update circleci-docker-primary image to point to most recent #3524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5492a26
Update circleci-docker-primary image to point to most recent
LeDeep Feb 12, 2020
be39deb
Update go version
LeDeep Feb 12, 2020
5b6e9ba
Update readme for go version updates
LeDeep Feb 12, 2020
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
12 changes: 6 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,28 @@ executors:
resource_class: small
working_directory: ~/transcom/mymove
docker:
- image: trussworks/circleci-docker-primary:6f138d780444b35181e0048282616f75a451d7b4
- image: trussworks/circleci-docker-primary:ba270cf66c7a9ae6dbc8e6190b74163ad71729d0
mymove_medium:
resource_class: medium
working_directory: ~/transcom/mymove
docker:
- image: trussworks/circleci-docker-primary:6f138d780444b35181e0048282616f75a451d7b4
- image: trussworks/circleci-docker-primary:ba270cf66c7a9ae6dbc8e6190b74163ad71729d0
mymove_medium_plus:
resource_class: medium+
working_directory: ~/transcom/mymove
docker:
- image: trussworks/circleci-docker-primary:6f138d780444b35181e0048282616f75a451d7b4
- image: trussworks/circleci-docker-primary:ba270cf66c7a9ae6dbc8e6190b74163ad71729d0
mymove_large:
resource_class: large
working_directory: ~/transcom/mymove
docker:
- image: trussworks/circleci-docker-primary:6f138d780444b35181e0048282616f75a451d7b4
- image: trussworks/circleci-docker-primary:ba270cf66c7a9ae6dbc8e6190b74163ad71729d0
# `mymove_and_postgres_medium` adds a secondary postgres container to be used during testing.
mymove_and_postgres_medium:
resource_class: medium
working_directory: ~/transcom/mymove
docker:
- image: trussworks/circleci-docker-primary:6f138d780444b35181e0048282616f75a451d7b4
- image: trussworks/circleci-docker-primary:ba270cf66c7a9ae6dbc8e6190b74163ad71729d0
- image: postgres:10.10
environment:
- POSTGRES_PASSWORD: mysecretpassword
Expand All @@ -48,7 +48,7 @@ executors:
resource_class: large
working_directory: ~/transcom/mymove
docker:
- image: trussworks/circleci-docker-primary:6f138d780444b35181e0048282616f75a451d7b4
- image: trussworks/circleci-docker-primary:ba270cf66c7a9ae6dbc8e6190b74163ad71729d0
- image: postgres:10.10
environment:
- POSTGRES_PASSWORD: mysecretpassword
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go-auto-approve.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: setup go
uses: actions/setup-go@v1
with:
go-version: '1.13.4'
go-version: '1.13.7'
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we have docs about updating the docker image. We may want to point out in the docs that this also needs updating.

Copy link
Contributor Author

@LeDeep LeDeep Feb 12, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

It was actually already in the documentation. I moved that step into the Update transcom/mymove repo section. I also updated the documentation to account for the new files that will need to be updated.

The transcom/ppp circleci config passes in latest for the docker image. So, I removed that section from the readme as those steps don't seem relevant anymore.

- name: Tidy
run: |
go version
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# BUILDER #
###########

FROM trussworks/circleci-docker-primary:6f138d780444b35181e0048282616f75a451d7b4 as builder
FROM trussworks/circleci-docker-primary:ba270cf66c7a9ae6dbc8e6190b74163ad71729d0 as builder

ENV CIRCLECI=true

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.migrations_local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# BUILDER #
###########

FROM trussworks/circleci-docker-primary:6f138d780444b35181e0048282616f75a451d7b4 as builder
FROM trussworks/circleci-docker-primary:ba270cf66c7a9ae6dbc8e6190b74163ad71729d0 as builder

ENV CIRCLECI=true

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.tasks_local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# BUILDER #
###########

FROM trussworks/circleci-docker-primary:6f138d780444b35181e0048282616f75a451d7b4 as builder
FROM trussworks/circleci-docker-primary:ba270cf66c7a9ae6dbc8e6190b74163ad71729d0 as builder

ENV CIRCLECI=true

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.tools_local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# BUILDER #
###########

FROM trussworks/circleci-docker-primary:6f138d780444b35181e0048282616f75a451d7b4 as builder
FROM trussworks/circleci-docker-primary:ba270cf66c7a9ae6dbc8e6190b74163ad71729d0 as builder

ENV CIRCLECI=true

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
server_test:
depends_on:
- database
image: trussworks/circleci-docker-primary:6f138d780444b35181e0048282616f75a451d7b4
image: trussworks/circleci-docker-primary:ba270cf66c7a9ae6dbc8e6190b74163ad71729d0
deploy:
resources:
limits:
Expand Down
25 changes: 9 additions & 16 deletions docs/how-to/upgrade-go-version.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,19 @@ For more details read the following sections.
## Update `transcom/mymove` Repo

- After your Docker image PR lands, grab the git hash from [Docker](https://hub.docker.com/r/trussworks/circleci-docker-primary/tags) that corresponds with your merged code
- Update `.circleci/config.yml` and `Dockerfile.dep_updater` with the updated Docker image git hash and Go version
- See [this PR](https://github.com/transcom/mymove/pull/1383/files) as an example
- Update the following files with the updated Docker image git hash and Go version:
- `.circleci/config.yml`
- `Dockerfile.local`
- `Dockerfile.tasks_local`
- `Dockerfile.tools_local`
- `docker-compose.circle.yml`
- Update `go-version` in `.github/workflows/go-auto-approve.yml`
- See [this PR](https://github.com/transcom/mymove/pull/3524/files) as an example
- For minor go version changes (but not patch changes) update `scripts/check-go-version`.
- Rerun the Go formatter on the codebase with `pre-commit run --all-files go-fmt`
- Run `make e2e_test_docker` to test that the `Dockerfile.*local` files work with the new image.
- Commit the above changes and any reformatted code and make sure everything builds correctly on CircleCI

## Update `transcom/ppp-infra` Repo

- After your Docker image PR lands, grab the git hash from [Docker](https://hub.docker.com/r/trussworks/circleci-docker-primary/tags) that corresponds with your merged code
- Update `.circleci/config.yml` and `Dockerfile` with the updated Docker image git hash and Go version
- See [this PR](https://github.com/transcom/ppp-infra/pull/525/files) as an example
- For minor go version changes (but not patch changes) update `scripts/check-go-version`.
- Rerun the Go formatter on the codebase with `pre-commit run --all-files go-fmt`
- Commit the above changes and any reformatted code and make sure everything builds correctly on CircleCI

## Update `github action` yaml

- Update `go-version` in `.github/workflows/go-auto-approve.yml`
- Commit the above changes and make sure the action builds when pushed to github

## Notify Folks

- It can be jarring when everything suddenly breaks after pulling from master, so it's a nice courtesy to notify folks in #dp3-engineering that the official Go version will be updated shortly and their local Go version should be upgraded as well
Expand Down