From 019c369f4822cfdf16313e0073697cb30848a29c Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Wed, 6 Nov 2024 15:59:32 -0500 Subject: [PATCH 1/4] docs(hermetic-build): indicate usage of Docker Buildkit in development guide --- hermetic_build/DEVELOPMENT.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hermetic_build/DEVELOPMENT.md b/hermetic_build/DEVELOPMENT.md index b6e78389dc..4ba3d4b9af 100644 --- a/hermetic_build/DEVELOPMENT.md +++ b/hermetic_build/DEVELOPMENT.md @@ -160,13 +160,15 @@ python hermetic_build/library_generation/cli/entry_point.py generate \ 1. Run the following command to build the image from source ```shell - docker build \ + DOCKER_BUILDKIT=1 docker build \ -f .cloudbuild/library_generation/library_generation.Dockerfile \ -t local:image-tag \ . ``` + Please note that the build only works when using the new + [Docker BuildKit](https://docs.docker.com/build/buildkit/) (enabled through the `DOCKER_BUILDKIT` variable). -2. Set the version of gapic-generator-java +3. Set the version of gapic-generator-java ```shell LOCAL_GENERATOR_VERSION=$(mvn \ @@ -177,7 +179,7 @@ python hermetic_build/library_generation/cli/entry_point.py generate \ -q) ``` -3. Run the image +4. Run the image ```shell # Assume you want to generate the library in the current working directory From 47757bf9dd6e22049d5cfdba0bd823b4fd00b1a8 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Wed, 6 Nov 2024 16:11:48 -0500 Subject: [PATCH 2/4] Update hermetic_build/DEVELOPMENT.md --- hermetic_build/DEVELOPMENT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hermetic_build/DEVELOPMENT.md b/hermetic_build/DEVELOPMENT.md index 4ba3d4b9af..65476bbd82 100644 --- a/hermetic_build/DEVELOPMENT.md +++ b/hermetic_build/DEVELOPMENT.md @@ -168,7 +168,7 @@ python hermetic_build/library_generation/cli/entry_point.py generate \ Please note that the build only works when using the new [Docker BuildKit](https://docs.docker.com/build/buildkit/) (enabled through the `DOCKER_BUILDKIT` variable). -3. Set the version of gapic-generator-java +2. Set the version of gapic-generator-java ```shell LOCAL_GENERATOR_VERSION=$(mvn \ From 23693a2259480588dea6269664e8d7362be43ed4 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Wed, 6 Nov 2024 16:44:59 -0500 Subject: [PATCH 3/4] Update DEVELOPMENT.md --- hermetic_build/DEVELOPMENT.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hermetic_build/DEVELOPMENT.md b/hermetic_build/DEVELOPMENT.md index 65476bbd82..3a1b45eaa8 100644 --- a/hermetic_build/DEVELOPMENT.md +++ b/hermetic_build/DEVELOPMENT.md @@ -167,8 +167,11 @@ python hermetic_build/library_generation/cli/entry_point.py generate \ ``` Please note that the build only works when using the new [Docker BuildKit](https://docs.docker.com/build/buildkit/) (enabled through the `DOCKER_BUILDKIT` variable). + This is meant for local development only - GH Actions' Ubuntu-22.04 \ + [comes with the latest Docker version](https://github.com/actions/runner-images/blob/e74605cd6d5407469cf224802f25057bafc23d70/images/ubuntu/Ubuntu2204-Readme.md?plain=1#L81-L83) + and is able to handle the build properly using the (updated) legacy builder. -2. Set the version of gapic-generator-java +3. Set the version of gapic-generator-java ```shell LOCAL_GENERATOR_VERSION=$(mvn \ From c8fa84d3caf0b7fcf73312024eba5f12d314cfb9 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Wed, 6 Nov 2024 16:46:27 -0500 Subject: [PATCH 4/4] Update DEVELOPMENT.md --- hermetic_build/DEVELOPMENT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hermetic_build/DEVELOPMENT.md b/hermetic_build/DEVELOPMENT.md index 3a1b45eaa8..e54c57e9ec 100644 --- a/hermetic_build/DEVELOPMENT.md +++ b/hermetic_build/DEVELOPMENT.md @@ -167,7 +167,7 @@ python hermetic_build/library_generation/cli/entry_point.py generate \ ``` Please note that the build only works when using the new [Docker BuildKit](https://docs.docker.com/build/buildkit/) (enabled through the `DOCKER_BUILDKIT` variable). - This is meant for local development only - GH Actions' Ubuntu-22.04 \ + This is meant for local development only (in CloudTops) - GH Actions' Ubuntu-22.04 \ [comes with the latest Docker version](https://github.com/actions/runner-images/blob/e74605cd6d5407469cf224802f25057bafc23d70/images/ubuntu/Ubuntu2204-Readme.md?plain=1#L81-L83) and is able to handle the build properly using the (updated) legacy builder.