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

feat(build): Build multi-architecture docker images for aztec-sandbox #2305

Merged
merged 4 commits into from
Sep 14, 2023
Merged

feat(build): Build multi-architecture docker images for aztec-sandbox #2305

merged 4 commits into from
Sep 14, 2023

Conversation

PhilWindle
Copy link
Collaborator

This PR builds and deploys multi-architecture docker images for aztec-sandbox

Checklist:

Remove the checklist to signal you've completed it. Enable auto-merge if the PR is ready to merge.

  • If the pull request requires a cryptography review (e.g. cryptographic algorithm implementations) I have added the 'crypto' tag.
  • I have reviewed my diff in github, line by line and removed unexpected formatting changes, testing logs, or commented-out code.
  • Every change is related to the PR description.
  • I have linked this pull request to relevant issues (if any exist).

@PhilWindle
Squashed commit of the following:
2566bd7 
commit 388880c
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 16:07:13 2023 +0000

    Cleanup

commit 2524022
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 15:59:32 2023 +0000

    Cleanup

commit a3346fd
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 15:58:10 2023 +0000

    Fixes and logging

commit c1a6f04
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 14:10:42 2023 +0000

    First attempt at creating dockerhub multi-arch deployments

commit d2267e4
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 11:58:35 2023 +0000

    Undo platform

commit bb49070
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 11:47:41 2023 +0000

    Try to for architecture

commit 0c4d18e
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 11:32:00 2023 +0000

    Run docker inspect

commit 17df6d8
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 11:01:38 2023 +0000

    Fixed manifest creationg

commit 3b260f7
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 10:47:56 2023 +0000

    Script fix

commit 56344d9
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 10:45:17 2023 +0000

    Try different tags

commit bb53506
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 10:18:39 2023 +0000

    Enable experimental features

commit f5e7220
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 10:12:38 2023 +0000

    Try again

commit db94735
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 09:49:00 2023 +0000

    Try create manifest

commit 624fc2c
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 09:13:37 2023 +0000

    Another fix

commit b1116cf
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 09:09:44 2023 +0000

    Fixed build manifest

commit 780a407
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 09:06:31 2023 +0000

    Fix

commit 6ea289f
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 09:02:16 2023 +0000

    Don't use force deploy build

commit 5f4e07c
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 08:55:40 2023 +0000

    Fix

commit 85c50d7
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 08:44:31 2023 +0000

    Fix

commit 263f9b4
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 08:43:22 2023 +0000

    Build off aztec-sandbox base

commit a8c039e
Merge: 61166fb cd8f349
Author: PhilWindle <philip.windle@gmail.com>
Date:   Thu Sep 14 08:24:50 2023 +0000

    Merge branch 'master' into pw/multi-platform-docker

commit 61166fb
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 19:32:45 2023 +0000

    Try a different image

commit 72cbb64
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 19:27:17 2023 +0000

    Different approach

commit b64769d
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 17:51:34 2023 +0000

    Another trial

commit a6cb5c2
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 17:44:35 2023 +0000

    Don't wait for tests

commit 90c2bc3
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 17:37:58 2023 +0000

    Build fixes

commit c943849
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 17:30:32 2023 +0000

    New docker file

commit c291101
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 17:23:56 2023 +0000

    WIP

commit 2497dae
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 17:17:34 2023 +0000

    WIP

commit 3a4372f
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 17:13:25 2023 +0000

    WIP

commit d1837a7
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 17:09:43 2023 +0000

    Don't always rebuild

commit ddcfb0f
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 17:08:36 2023 +0000

    WIP

commit a80d87f
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 16:59:20 2023 +0000

    WIP

commit 9f3b997
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 16:57:26 2023 +0000

    WIP

commit 1e3255b
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 16:56:46 2023 +0000

    WIP

commit 6094593
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 16:29:29 2023 +0000

    WIP

commit f9083d1
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 16:20:30 2023 +0000

    WIP

commit 09ec5ab
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 15:57:50 2023 +0000

    WIP

commit 4100d7b
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 15:21:04 2023 +0000

    WIP

commit 59da431
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 15:03:51 2023 +0000

    Merge fixes

commit f4e4eb5
Merge: 8f0dd87 6a55724
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 14:59:23 2023 +0000

    Merge branch 'master' into pw/multi-platform-docker

commit 8f0dd87
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 14:45:56 2023 +0000

    WIP

commit 24e6757
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 14:03:33 2023 +0000

    WIP

commit 5a697cd
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 11:18:44 2023 +0000

    Retry docker buildx installation

commit d3ef13a
Author: PhilWindle <philip.windle@gmail.com>
Date:   Wed Sep 13 11:04:04 2023 +0000

    Just ARM

commit dcc15ee
Author: PhilWindle <philip.windle@gmail.com>
Date:   Tue Sep 12 17:06:29 2023 +0000

    WIP

commit 4285ab2
Author: PhilWindle <philip.windle@gmail.com>
Date:   Tue Sep 12 16:59:40 2023 +0000

    WIP

commit ae06b72
Author: PhilWindle <philip.windle@gmail.com>
Date:   Tue Sep 12 16:56:37 2023 +0000

    WIP

commit baf6e56
Author: PhilWindle <philip.windle@gmail.com>
Date:   Tue Sep 12 16:52:45 2023 +0000

    WIP

commit 45ea7f6
Author: PhilWindle <philip.windle@gmail.com>
Date:   Tue Sep 12 16:48:24 2023 +0000

    WIP

commit 3a492bf
Author: PhilWindle <philip.windle@gmail.com>
Date:   Tue Sep 12 16:44:46 2023 +0000

    WIP

commit 5fb63dc
Author: PhilWindle <philip.windle@gmail.com>
Date:   Tue Sep 12 16:27:31 2023 +0000

    WIP

commit ceebd61
Author: PhilWindle <philip.windle@gmail.com>
Date:   Tue Sep 12 16:24:15 2023 +0000

    WIP

commit c794a4a
Author: PhilWindle <philip.windle@gmail.com>
Date:   Tue Sep 12 16:20:24 2023 +0000

    WIP

commit e4dd2c4
Author: PhilWindle <philip.windle@gmail.com>
Date:   Tue Sep 12 16:17:54 2023 +0000

    WIP

commit 1b25616
Author: PhilWindle <philip.windle@gmail.com>
Date:   Tue Sep 12 16:15:06 2023 +0000

    WIP

commit d6fe939
Author: PhilWindle <philip.windle@gmail.com>
Date:   Tue Sep 12 16:13:43 2023 +0000

    WIP

commit 96901a4
Author: PhilWindle <philip.windle@gmail.com>
Date:   Tue Sep 12 16:06:04 2023 +0000

    WIP

commit 6750c89
Author: PhilWindle <philip.windle@gmail.com>
Date:   Tue Sep 12 15:56:54 2023 +0000

    WIP
@PhilWindle
Cleanup
73c0901
@PhilWindle
Cleanup
a50a833
@PhilWindle PhilWindle marked this pull request as ready for review September 14, 2023 16:17
spypsy
spypsy reviewed Sep 14, 2023
View reviewed changes
.circleci/config.yml Outdated Show resolved Hide resolved
spalladino
spalladino approved these changes Sep 14, 2023
View reviewed changes
Copy link
Collaborator

@spalladino spalladino left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM! One comment though: it seems we're always tagging the multi-arch manifest we deploy to dockerhub as latest. This can backfire if we ever want to release a fix for an old version (eg we got 1.0 and 2.0 out there, and we want to release a 1.1 with a fix, then 1.1 would overtake 2.0 as latest). But I'm not sure if we already had this problem before in our deployment scripts.

@PhilWindle
Copy link
Collaborator Author

LGTM! One comment though: it seems we're always tagging the multi-arch manifest we deploy to dockerhub as latest. This can backfire if we ever want to release a fix for an old version (eg we got 1.0 and 2.0 out there, and we want to release a 1.1 with a fix, then 1.1 would overtake 2.0 as latest). But I'm not sure if we already had this problem before in our deployment scripts.

Yes, that problem already existed. It's definitely something to note in future.

spypsy
spypsy reviewed Sep 14, 2023
View reviewed changes
build-system/scripts/force_deploy_build
set -e

REPOSITORY=$1
FORCE_BUILD=${2:-"false"}
shift
Copy link
Member

Choose a reason for hiding this comment

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

curious, why are we starting to use shift for positional args in our scripts?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It's when you want to pass arguments past a certain point through to child scripts. So in this script, the first 2 args are consumed by this script and then any remaining args are passed to the build script via $@ (meaning all the current args).

@PhilWindle PhilWindle merged commit 8ee61b8 into master Sep 14, 2023
90 checks passed
@PhilWindle PhilWindle deleted the pw/multi-platform-docker-2 branch September 14, 2023 18:26
@AztecBot AztecBot mentioned this pull request Sep 14, 2023
Merged
PhilWindle pushed a commit that referenced this pull request Sep 14, 2023
@AztecBot
chore(master): Release 0.7.1 (#2268)
4d3e341 
🤖 I have created a release *beep* *boop*
---


<details><summary>aztec-packages: 0.7.1</summary>

##
[0.7.1](aztec-packages-v0.7.0...aztec-packages-v0.7.1)
(2023-09-14)


### Features

* Build system handles dynamic deps first class.
([#2283](#2283))
([f66077a](f66077a))
* Build_manifest default tweaks.
([#2287](#2287))
([c8a5cfb](c8a5cfb))
* **build:** Build multi-architecture docker images for aztec-sandbox
([#2305](#2305))
([8ee61b8](8ee61b8))
* Cli "unbox" command
([#2029](#2029))
([26ab88f](26ab88f))
* Creating an SMT verification module
([#1932](#1932))
([4642b61](4642b61))
* Token standard
([#2069](#2069))
([5e8fbf2](5e8fbf2))


### Bug Fixes

* Ensure_note_hash_exists
([#2256](#2256))
([271b060](271b060))
* Msgpack stack blowups on schema gen
([#2259](#2259))
([1afc566](1afc566))
* Noir bootstrap
([#2274](#2274))
([f85db49](f85db49))
* Workaround sequencer timeout
([#2269](#2269))
([9fc3f3d](9fc3f3d))


### Miscellaneous

* Bump nargo to 0.11.1-aztec.0
([#2298](#2298))
([8b76a12](8b76a12))
* **ci:** Mirror Aztec-nr
([#2270](#2270))
([c57f027](c57f027))
* **circuits:** Base rollup cbind msgpack
([#2263](#2263))
([0d4c707](0d4c707))
* **circuits:** Clean up of some superfluous header includes
([#2302](#2302))
([5e53345](5e53345))
* **circuits:** Removing assertMemberLength on Tuple objects
([#2296](#2296))
([0247b85](0247b85))
* Consolidate mirror repos on a nightly schedule
([#1994](#1994))
([1a586c4](1a586c4))
* **docs:** Rename to aztec.nr
([#1943](#1943))
([a91db48](a91db48))
* Move barretenberg to top of repo. Make circuits build off barretenberg
build.
([#2221](#2221))
([404ec34](404ec34))
* Replace native token in lending contract
([#2276](#2276))
([c46b3c8](c46b3c8))
* **subrepo:** Push aztec-nr, update default branches
([#2300](#2300))
([80c9b77](80c9b77))
* Updated `acvm_js`
([#2272](#2272))
([9f1a3a5](9f1a3a5))
</details>

<details><summary>barretenberg.js: 0.7.1</summary>

##
[0.7.1](barretenberg.js-v0.7.0...barretenberg.js-v0.7.1)
(2023-09-14)


### Miscellaneous

* Move barretenberg to top of repo. Make circuits build off barretenberg
build.
([#2221](#2221))
([404ec34](404ec34))
</details>

<details><summary>barretenberg: 0.7.1</summary>

##
[0.7.1](barretenberg-v0.7.0...barretenberg-v0.7.1)
(2023-09-14)


### Miscellaneous

* Move barretenberg to top of repo. Make circuits build off barretenberg
build.
([#2221](#2221))
([404ec34](404ec34))
</details>

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
This was referenced Sep 15, 2023
Open
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ludamad ludamad ludamad approved these changes

@spalladino spalladino spalladino approved these changes

@spypsy spypsy spypsy approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@PhilWindle @ludamad @spalladino @spypsy