Merge branch 'master' into dependabot/github_actions/gradle/wrapper-v…

…alidation-action-3.5.0
GoogleContainerTools · Aug 23, 2024 · de953d8 · de953d8
2 parents a659229 + 45610ea
commit de953d8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/.github/workflows/jib-cli-release.yml b/.github/workflows/jib-cli-release.yml
@@ -56,9 +56,7 @@ jobs:
         uses: repo-sync/[email protected]
         id: create-pr
         with:
-          # Use a personal token to file a PR as a non-bot author to trigger other workflows (e.g., unit tests):
-          # https://docs.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token;
-          github_token: ${{ secrets.GA_RELEASE_PR_PERSONAL_TOKEN }}
+          github_token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
           source_branch: cli-release-v${{ github.event.inputs.release_version }}
           pr_title: "CLI release v${{ github.event.inputs.release_version }}"
           pr_body: "To be merged after the release is complete."

diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -62,11 +62,7 @@ jobs:
         uses: repo-sync/[email protected]
         id: create-pr
         with:
-          # Use a personal token to file a PR to trigger other workflows (e.g., unit tests).
-          # Save your access token as GA_RELEASE_PR_PERSONAL_TOKEN.             
-          # https://docs.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token
-          # https://docs.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets
-          github_token: ${{ secrets.GA_RELEASE_PR_PERSONAL_TOKEN }}
+          github_token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
           source_branch: ${{ github.event.inputs.project }}-release-v${{ github.event.inputs.release_version }}
           pr_title: "${{ github.event.inputs.project }} release v${{ github.event.inputs.release_version }}"
           pr_body: "To be merged after the release is complete."

diff --git a/jib-core/src/main/java/com/google/cloud/tools/jib/docker/CliDockerClient.java b/jib-core/src/main/java/com/google/cloud/tools/jib/docker/CliDockerClient.java
@@ -189,11 +189,12 @@ public boolean supported(Map<String, String> parameters) {
   public DockerInfoDetails info() throws IOException, InterruptedException {
     // Runs 'docker info'.
     Process infoProcess = docker("info", "-f", "{{json .}}");
+    InputStream inputStream = infoProcess.getInputStream();
     if (infoProcess.waitFor() != 0) {
       throw new IOException(
           "'docker info' command failed with error: " + getStderrOutput(infoProcess));
     }
-    return JsonTemplateMapper.readJson(infoProcess.getInputStream(), DockerInfoDetails.class);
+    return JsonTemplateMapper.readJson(inputStream, DockerInfoDetails.class);
   }
 
   @Override