[build] cmd/gitmirror: remove reference to obsolete "apt-key"

2 views
Skip to first unread message

David Chase (Gerrit)

unread,
Feb 26, 2026, 6:26:52 PM (yesterday) Feb 26
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com

David Chase has uploaded the change for review

Commit message

cmd/gitmirror: remove reference to obsolete "apt-key"

The Dockerfile was using the "old" version of some
command-line incantation, this is the "new" version.
Change-Id: If60c110cb98fdb882f8fd471e333e25faf794086

Change diff

diff --git a/cmd/gitmirror/Dockerfile b/cmd/gitmirror/Dockerfile
index 2862bb3..4b73d9d 100644
--- a/cmd/gitmirror/Dockerfile
+++ b/cmd/gitmirror/Dockerfile
@@ -35,7 +35,12 @@
 	&& rm -rf /var/lib/apt/lists/*
 
 # Install gcloud for auth to CSR, see https://cloud.google.com/sdk/docs/install#deb
-RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg  add - && apt-get update -y && apt-get install google-cloud-sdk -y && rm -rf /var/lib/apt/lists/*
+RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | \
+    tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
+    curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
+    gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg && \
+    apt-get update -y && apt-get install google-cloud-sdk -y && \
+    rm -rf /var/lib/apt/lists/*
 
 # Add github.com's known_hosts entries, so git push calls later don't
 # prompt, and don't need to have their strict host key checking

Change information

Files:
  • M cmd/gitmirror/Dockerfile
Change size: XS
Delta: 1 file changed, 6 insertions(+), 1 deletion(-)
Open in Gerrit

Related details

Attention set is empty
Submit Requirements:
  • requirement is not satisfiedCode-Review
  • requirement satisfiedNo-Unresolved-Comments
  • requirement is not satisfiedReview-Enforcement
  • requirement is not satisfiedTryBots-Pass
Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. DiffyGerrit
Gerrit-MessageType: newchange
Gerrit-Project: build
Gerrit-Branch: master
Gerrit-Change-Id: If60c110cb98fdb882f8fd471e333e25faf794086
Gerrit-Change-Number: 749600
Gerrit-PatchSet: 1
Gerrit-Owner: David Chase <drc...@google.com>
Gerrit-Reviewer: David Chase <drc...@google.com>
unsatisfied_requirement
satisfied_requirement
open
diffy

Dmitri Shuralyov (Gerrit)

unread,
Feb 26, 2026, 6:52:11 PM (24 hours ago) Feb 26
to David Chase, goph...@pubsubhelper.golang.org, Dmitri Shuralyov, Go LUCI, Carlos Amedee, Gopher Robot, golang-co...@googlegroups.com
Attention needed from Carlos Amedee and David Chase

Dmitri Shuralyov voted and added 2 comments

Votes added by Dmitri Shuralyov

Code-Review+2

2 comments

Patchset-level comments
File-level comment, Patchset 1 (Latest):
Dmitri Shuralyov . resolved

Thanks. Some minor (optional) suggestions.

File cmd/gitmirror/Dockerfile
Line 38, Patchset 1 (Latest):RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | \
tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \

gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg && \
apt-get update -y && apt-get install google-cloud-sdk -y && \
rm -rf /var/lib/apt/lists/*
Dmitri Shuralyov . unresolved

Splitting this long line to one-line-per-command for readability seems good, but maybe it's worth keeping the one-command-pipe-into-another together? I don't feel strongly about it, so feel free not to change it.

Also s/http/https/ in one of the URLs and let's stay with tabs for indentation since that's used above and below (too bad we don't benefit from gofmt here).

Something like:

```suggestion
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
	curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg && \

	apt-get update -y && apt-get install google-cloud-sdk -y && \
	rm -rf /var/lib/apt/lists/*
```
Open in Gerrit

Related details

Attention is currently required from:
  • Carlos Amedee
  • David Chase
Submit Requirements:
  • requirement satisfiedCode-Review
  • requirement is not satisfiedNo-Unresolved-Comments
  • requirement is not satisfiedReview-Enforcement
  • requirement satisfiedTryBots-Pass
Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. DiffyGerrit
Gerrit-MessageType: comment
Gerrit-Project: build
Gerrit-Branch: master
Gerrit-Change-Id: If60c110cb98fdb882f8fd471e333e25faf794086
Gerrit-Change-Number: 749600
Gerrit-PatchSet: 1
Gerrit-Owner: David Chase <drc...@google.com>
Gerrit-Reviewer: Carlos Amedee <car...@golang.org>
Gerrit-Reviewer: David Chase <drc...@google.com>
Gerrit-Reviewer: Dmitri Shuralyov <dmit...@golang.org>
Gerrit-CC: Gopher Robot <go...@golang.org>
Gerrit-Attention: David Chase <drc...@google.com>
Gerrit-Attention: Carlos Amedee <car...@golang.org>
Gerrit-Comment-Date: Thu, 26 Feb 2026 23:52:08 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
satisfied_requirement
unsatisfied_requirement
open
diffy

Dmitri Shuralyov (Gerrit)

unread,
Feb 26, 2026, 6:52:43 PM (24 hours ago) Feb 26
to David Chase, goph...@pubsubhelper.golang.org, Dmitri Shuralyov, Go LUCI, Carlos Amedee, Gopher Robot, golang-co...@googlegroups.com
Attention needed from Carlos Amedee and David Chase

Dmitri Shuralyov voted Code-Review+1

Code-Review+1
Open in Gerrit

Related details

Attention is currently required from:
  • Carlos Amedee
  • David Chase
Submit Requirements:
    • requirement satisfiedCode-Review
    • requirement is not satisfiedNo-Unresolved-Comments
    • requirement satisfiedReview-Enforcement
    • requirement satisfiedTryBots-Pass
    Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. DiffyGerrit
    Gerrit-MessageType: comment
    Gerrit-Project: build
    Gerrit-Branch: master
    Gerrit-Change-Id: If60c110cb98fdb882f8fd471e333e25faf794086
    Gerrit-Change-Number: 749600
    Gerrit-PatchSet: 1
    Gerrit-Owner: David Chase <drc...@google.com>
    Gerrit-Reviewer: Carlos Amedee <car...@golang.org>
    Gerrit-Reviewer: David Chase <drc...@google.com>
    Gerrit-Reviewer: Dmitri Shuralyov <dmit...@golang.org>
    Gerrit-Reviewer: Dmitri Shuralyov <dmit...@google.com>
    Gerrit-CC: Gopher Robot <go...@golang.org>
    Gerrit-Attention: David Chase <drc...@google.com>
    Gerrit-Attention: Carlos Amedee <car...@golang.org>
    Gerrit-Comment-Date: Thu, 26 Feb 2026 23:52:40 +0000
    Gerrit-HasComments: No
    Gerrit-Has-Labels: Yes
    satisfied_requirement
    unsatisfied_requirement
    open
    diffy

    Cherry Mui (Gerrit)

    unread,
    Feb 26, 2026, 9:26:10 PM (21 hours ago) Feb 26
    to David Chase, goph...@pubsubhelper.golang.org, Dmitri Shuralyov, Dmitri Shuralyov, Go LUCI, Carlos Amedee, Gopher Robot, golang-co...@googlegroups.com
    Attention needed from Carlos Amedee and David Chase

    Cherry Mui voted Code-Review+2

    Code-Review+2
    Open in Gerrit

    Related details

    Attention is currently required from:
    • Carlos Amedee
    • David Chase
    Submit Requirements:
    • requirement satisfiedCode-Review
    • requirement is not satisfiedNo-Unresolved-Comments
    • requirement satisfiedReview-Enforcement
    • requirement satisfiedTryBots-Pass
    Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. DiffyGerrit
    Gerrit-MessageType: comment
    Gerrit-Project: build
    Gerrit-Branch: master
    Gerrit-Change-Id: If60c110cb98fdb882f8fd471e333e25faf794086
    Gerrit-Change-Number: 749600
    Gerrit-PatchSet: 1
    Gerrit-Owner: David Chase <drc...@google.com>
    Gerrit-Reviewer: Carlos Amedee <car...@golang.org>
    Gerrit-Reviewer: Cherry Mui <cher...@google.com>
    Gerrit-Reviewer: David Chase <drc...@google.com>
    Gerrit-Reviewer: Dmitri Shuralyov <dmit...@golang.org>
    Gerrit-Reviewer: Dmitri Shuralyov <dmit...@google.com>
    Gerrit-CC: Gopher Robot <go...@golang.org>
    Gerrit-Attention: David Chase <drc...@google.com>
    Gerrit-Attention: Carlos Amedee <car...@golang.org>
    Gerrit-Comment-Date: Fri, 27 Feb 2026 02:26:06 +0000
    Gerrit-HasComments: No
    Gerrit-Has-Labels: Yes
    satisfied_requirement
    unsatisfied_requirement
    open
    diffy

    David Chase (Gerrit)

    unread,
    3:30 PM (3 hours ago) 3:30 PM
    to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
    Attention needed from Carlos Amedee and David Chase

    David Chase uploaded new patchset

    David Chase uploaded patch set #2 to this change.
    Following approvals got outdated and were removed:
    • TryBots-Pass: LUCI-TryBot-Result+1 by Go LUCI
    Open in Gerrit

    Related details

    Attention is currently required from:
    • Carlos Amedee
    • David Chase
    Submit Requirements:
      • requirement satisfiedCode-Review
      • requirement is not satisfiedNo-Unresolved-Comments
      • requirement satisfiedReview-Enforcement
      • requirement is not satisfiedTryBots-Pass
      Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. DiffyGerrit
      Gerrit-MessageType: newpatchset
      Gerrit-Project: build
      Gerrit-Branch: master
      Gerrit-Change-Id: If60c110cb98fdb882f8fd471e333e25faf794086
      Gerrit-Change-Number: 749600
      Gerrit-PatchSet: 2
      satisfied_requirement
      unsatisfied_requirement
      open
      diffy

      David Chase (Gerrit)

      unread,
      3:31 PM (3 hours ago) 3:31 PM
      to goph...@pubsubhelper.golang.org, Cherry Mui, Dmitri Shuralyov, Dmitri Shuralyov, Go LUCI, Carlos Amedee, Gopher Robot, golang-co...@googlegroups.com
      Attention needed from Carlos Amedee

      David Chase voted Commit-Queue+1

      Commit-Queue+1
      Open in Gerrit

      Related details

      Attention is currently required from:
      • Carlos Amedee
      Submit Requirements:
      • requirement satisfiedCode-Review
      • requirement is not satisfiedNo-Unresolved-Comments
      • requirement satisfiedReview-Enforcement
      • requirement is not satisfiedTryBots-Pass
      Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. DiffyGerrit
      Gerrit-MessageType: comment
      Gerrit-Project: build
      Gerrit-Branch: master
      Gerrit-Change-Id: If60c110cb98fdb882f8fd471e333e25faf794086
      Gerrit-Change-Number: 749600
      Gerrit-PatchSet: 2
      Gerrit-Owner: David Chase <drc...@google.com>
      Gerrit-Reviewer: Carlos Amedee <car...@golang.org>
      Gerrit-Reviewer: Cherry Mui <cher...@google.com>
      Gerrit-Reviewer: David Chase <drc...@google.com>
      Gerrit-Reviewer: Dmitri Shuralyov <dmit...@golang.org>
      Gerrit-Reviewer: Dmitri Shuralyov <dmit...@google.com>
      Gerrit-CC: Gopher Robot <go...@golang.org>
      Gerrit-Attention: Carlos Amedee <car...@golang.org>
      Gerrit-Comment-Date: Fri, 27 Feb 2026 20:31:17 +0000
      Gerrit-HasComments: No
      Gerrit-Has-Labels: Yes
      satisfied_requirement
      unsatisfied_requirement
      open
      diffy

      David Chase (Gerrit)

      unread,
      3:32 PM (3 hours ago) 3:32 PM
      to goph...@pubsubhelper.golang.org, Cherry Mui, Dmitri Shuralyov, Dmitri Shuralyov, Go LUCI, Carlos Amedee, Gopher Robot, golang-co...@googlegroups.com
      Attention needed from Carlos Amedee

      David Chase added 1 comment

      File cmd/gitmirror/Dockerfile
      Line 38, Patchset 1:RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | \

      tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
      curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
      gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg && \
      apt-get update -y && apt-get install google-cloud-sdk -y && \
      rm -rf /var/lib/apt/lists/*
      Dmitri Shuralyov . resolved

      Splitting this long line to one-line-per-command for readability seems good, but maybe it's worth keeping the one-command-pipe-into-another together? I don't feel strongly about it, so feel free not to change it.

      Also s/http/https/ in one of the URLs and let's stay with tabs for indentation since that's used above and below (too bad we don't benefit from gofmt here).

      Something like:

      ```suggestion
      RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
      	curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg && \
      	apt-get update -y && apt-get install google-cloud-sdk -y && \
      	rm -rf /var/lib/apt/lists/*
      ```
      David Chase

      I added the missing "s" to http and then re-deployed to be sure that it still worked. Should be tabs for whitespace, did not reflow the line because I could not easily read the other one.

      Open in Gerrit

      Related details

      Attention is currently required from:
      • Carlos Amedee
      Submit Requirements:
      • requirement satisfiedCode-Review
      • requirement satisfiedNo-Unresolved-Comments
      • requirement satisfiedReview-Enforcement
      • requirement is not satisfiedTryBots-Pass
      Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. DiffyGerrit
      Gerrit-MessageType: comment
      Gerrit-Project: build
      Gerrit-Branch: master
      Gerrit-Change-Id: If60c110cb98fdb882f8fd471e333e25faf794086
      Gerrit-Change-Number: 749600
      Gerrit-PatchSet: 2
      Gerrit-Owner: David Chase <drc...@google.com>
      Gerrit-Reviewer: Carlos Amedee <car...@golang.org>
      Gerrit-Reviewer: Cherry Mui <cher...@google.com>
      Gerrit-Reviewer: David Chase <drc...@google.com>
      Gerrit-Reviewer: Dmitri Shuralyov <dmit...@golang.org>
      Gerrit-Reviewer: Dmitri Shuralyov <dmit...@google.com>
      Gerrit-CC: Gopher Robot <go...@golang.org>
      Gerrit-Attention: Carlos Amedee <car...@golang.org>
      Gerrit-Comment-Date: Fri, 27 Feb 2026 20:32:42 +0000
      Gerrit-HasComments: Yes
      Gerrit-Has-Labels: No
      Comment-In-Reply-To: Dmitri Shuralyov <dmit...@golang.org>
      satisfied_requirement
      unsatisfied_requirement
      open
      diffy

      Dmitri Shuralyov (Gerrit)

      unread,
      3:48 PM (3 hours ago) 3:48 PM
      to David Chase, goph...@pubsubhelper.golang.org, Go LUCI, Cherry Mui, Dmitri Shuralyov, Dmitri Shuralyov, Carlos Amedee, Gopher Robot, golang-co...@googlegroups.com
      Attention needed from Carlos Amedee and David Chase

      Dmitri Shuralyov voted and added 1 comment

      Votes added by Dmitri Shuralyov

      Code-Review+2

      1 comment

      Patchset-level comments
      Dmitri Shuralyov . resolved

      Thanks.

      Open in Gerrit

      Related details

      Attention is currently required from:
      • Carlos Amedee
      • David Chase
      Submit Requirements:
        • requirement satisfiedCode-Review
        • requirement satisfiedNo-Unresolved-Comments
        • requirement satisfiedReview-Enforcement
        • requirement satisfiedTryBots-Pass
        Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. DiffyGerrit
        Gerrit-MessageType: comment
        Gerrit-Project: build
        Gerrit-Branch: master
        Gerrit-Change-Id: If60c110cb98fdb882f8fd471e333e25faf794086
        Gerrit-Change-Number: 749600
        Gerrit-PatchSet: 2
        Gerrit-Owner: David Chase <drc...@google.com>
        Gerrit-Reviewer: Carlos Amedee <car...@golang.org>
        Gerrit-Reviewer: Cherry Mui <cher...@google.com>
        Gerrit-Reviewer: David Chase <drc...@google.com>
        Gerrit-Reviewer: Dmitri Shuralyov <dmit...@golang.org>
        Gerrit-Reviewer: Dmitri Shuralyov <dmit...@google.com>
        Gerrit-CC: Gopher Robot <go...@golang.org>
        Gerrit-Attention: David Chase <drc...@google.com>
        Gerrit-Attention: Carlos Amedee <car...@golang.org>
        Gerrit-Comment-Date: Fri, 27 Feb 2026 20:48:05 +0000
        Gerrit-HasComments: Yes
        Gerrit-Has-Labels: Yes
        satisfied_requirement
        open
        diffy
        Reply all
        Reply to author
        Forward
        0 new messages