Update Git by keeganwitt · Pull Request #8881 · docker-library/official-images

keeganwitt · 2020-10-11T23:28:11Z

Temporarily using PPA for Git until AdoptOpenJDK/openjdk-docker#397 gets merged.

tianon · 2020-10-12T17:03:14Z

Somehow, I don't think updating library/amazoncorretto is what you intended here 😄

keeganwitt · 2020-10-12T17:15:30Z

Somehow, I don't think updating library/amazoncorretto is what you intended here 😄

Oops. It certainly wasn't.

tianon · 2020-10-12T21:59:54Z

(force push due to actions/runner#751 so we can hopefully get some test builds)

tianon · 2020-10-12T22:25:55Z

Arg, looks like add-apt-repository defaults to using https://keyserver.ubuntu.com, which our mitigations for https://github.com/docker-library/faq#openpgp--gnupg-keys-and-verification end up breaking.

It looks like (https://manpages.ubuntu.com/manpages/bionic/en/man1/add-apt-repository.1.html) it's supposed to support a --keyserver flag to explicitly overwrite that, which would be an easy solution here, but it appears at some point the ppa: functionality of it was rewritten to only support https://keyserver.ubuntu.com (hard-coded; https://salsa.debian.org/pkgutopia-team/software-properties/-/blob/bb1cf92d19d48aa0779f6a93e15dbb360fcb6dee/softwareproperties/ppa.py#L49), so I'm not sure what to do here. 😞

keeganwitt · 2020-10-13T00:03:46Z

I'm thinking maybe
apt-key adv --keyserver ha.pool.sks-keyservers.net --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 (that seems to be the key mentioned on the PPA page: https://launchpad.net/~git-core/+archive/ubuntu/ppa).

gradle/docker-gradle#158

yosifkit · 2020-10-13T00:14:21Z

We recommend using gpg directly (as recommended by the apt-key add manpage).

https://github.com/docker-library/official-images/tree/548d851413ad8c3682e6514b7f0f58fd47305852#image-build:

RUN set -eux; \
    key='A4A9406876FCBD3C456770C88C718D3B5072E1F5'; \
    export GNUPGHOME="$(mktemp -d)"; \
    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
    gpg --batch --armor --export "$key" > /etc/apt/trusted.gpg.d/mysql.gpg.asc; \
    gpgconf --kill all; \
    rm -rf "$GNUPGHOME"; \
    apt-key list

keeganwitt · 2020-10-13T00:35:31Z

What's the apt-key list for?

keeganwitt · 2020-10-13T15:55:33Z

Well shoot, it looks like it runs the key import even if its already in the keyring. Unless I imported it wrong? I didn't notice this in my test, but I must not have had logging turned up enough to see it.

tianon · 2020-10-13T16:55:16Z

At this point, you're now importing the key manually and all add-apt-repository is going to do for you is set up sources.list and do apt-get update, so you might as well just do echo 'deb http://ppa.launchpad.net/git-core/ppa/ubuntu bionic main' > /etc/apt/sources.list.d/git-core-ppa.list (or similar) yourself. 😅

What's the apt-key list for?

We use apt-key list as a basic smoke test to make sure the format of the resulting file is something APT is willing to ingest. In some places, we get slightly more specific (apt-key list | grep -i mysql, for example), but we've found that just invoking apt-key list is usually enough to catch the most common errors. However, since you're then immediately doing apt-get update in the same layer, it's likely a moot point since APT will then validate it anyhow. 😄

github-actions · 2020-10-13T18:16:40Z

Diff for bc0a943:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index bc066f4..8819c83 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,6 +1,6 @@
 Maintainers: Keegan Witt <keeganwitt@gmail.com> (@keeganwitt)
 GitRepo: https://github.com/keeganwitt/docker-gradle.git
-GitCommit: f6e27a40b3c8b6dcc8dc07a278f7a9f0c2a808cb
+GitCommit: 391db05e9a4c9aad68979d7df2eb42f2ada5e303
 
 Tags: 6.6.1-jdk8, 6.6-jdk8, jdk8, 6.6.1-jdk, 6.6-jdk, jdk, 6.6.1, 6.6, latest
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
diff --git a/gradle_jdk11/Dockerfile b/gradle_jdk11/Dockerfile
index 90c7a21..aad4a1f 100644
--- a/gradle_jdk11/Dockerfile
+++ b/gradle_jdk11/Dockerfile
@@ -19,6 +19,15 @@ VOLUME /home/gradle/.gradle
 WORKDIR /home/gradle
 
 RUN apt-get update \
+    && apt-get install --yes --no-install-recommends gnupg \
+    && key='E1DD270288B4E6030699E45FA1715D88E1DF1F24' \
+    && export GNUPGHOME="$(mktemp -d)" \
+    && gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \
+    && gpg --batch --armor --export "$key" > /etc/apt/trusted.gpg.d/git-ppa.gpg.asc \
+    && gpgconf --kill all \
+    && rm -rf "$GNUPGHOME" \
+    && echo 'deb http://ppa.launchpad.net/git-core/ppa/ubuntu bionic main' > /etc/apt/sources.list.d/git-core-ppa.list \
+    && apt-get update \
     && apt-get install --yes --no-install-recommends \
         fontconfig \
         unzip \
diff --git a/gradle_jdk14/Dockerfile b/gradle_jdk14/Dockerfile
index 28a54b0..806dbe2 100644
--- a/gradle_jdk14/Dockerfile
+++ b/gradle_jdk14/Dockerfile
@@ -19,6 +19,15 @@ VOLUME /home/gradle/.gradle
 WORKDIR /home/gradle
 
 RUN apt-get update \
+    && apt-get install --yes --no-install-recommends gnupg \
+    && key='E1DD270288B4E6030699E45FA1715D88E1DF1F24' \
+    && export GNUPGHOME="$(mktemp -d)" \
+    && gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \
+    && gpg --batch --armor --export "$key" > /etc/apt/trusted.gpg.d/git-ppa.gpg.asc \
+    && gpgconf --kill all \
+    && rm -rf "$GNUPGHOME" \
+    && echo 'deb http://ppa.launchpad.net/git-core/ppa/ubuntu bionic main' > /etc/apt/sources.list.d/git-core-ppa.list \
+    && apt-get update \
     && apt-get install --yes --no-install-recommends \
         fontconfig \
         unzip \
diff --git a/gradle_jre/Dockerfile b/gradle_jre/Dockerfile
index 184652e..dd4ab6a 100644
--- a/gradle_jre/Dockerfile
+++ b/gradle_jre/Dockerfile
@@ -19,6 +19,15 @@ VOLUME /home/gradle/.gradle
 WORKDIR /home/gradle
 
 RUN apt-get update \
+    && apt-get install --yes --no-install-recommends gnupg \
+    && key='E1DD270288B4E6030699E45FA1715D88E1DF1F24' \
+    && export GNUPGHOME="$(mktemp -d)" \
+    && gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \
+    && gpg --batch --armor --export "$key" > /etc/apt/trusted.gpg.d/git-ppa.gpg.asc \
+    && gpgconf --kill all \
+    && rm -rf "$GNUPGHOME" \
+    && echo 'deb http://ppa.launchpad.net/git-core/ppa/ubuntu bionic main' > /etc/apt/sources.list.d/git-core-ppa.list \
+    && apt-get update \
     && apt-get install --yes --no-install-recommends \
         fontconfig \
         unzip \
diff --git a/gradle_jre11/Dockerfile b/gradle_jre11/Dockerfile
index 452d35f..04ab874 100644
--- a/gradle_jre11/Dockerfile
+++ b/gradle_jre11/Dockerfile
@@ -19,6 +19,15 @@ VOLUME /home/gradle/.gradle
 WORKDIR /home/gradle
 
 RUN apt-get update \
+    && apt-get install --yes --no-install-recommends gnupg \
+    && key='E1DD270288B4E6030699E45FA1715D88E1DF1F24' \
+    && export GNUPGHOME="$(mktemp -d)" \
+    && gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \
+    && gpg --batch --armor --export "$key" > /etc/apt/trusted.gpg.d/git-ppa.gpg.asc \
+    && gpgconf --kill all \
+    && rm -rf "$GNUPGHOME" \
+    && echo 'deb http://ppa.launchpad.net/git-core/ppa/ubuntu bionic main' > /etc/apt/sources.list.d/git-core-ppa.list \
+    && apt-get update \
     && apt-get install --yes --no-install-recommends \
         fontconfig \
         unzip \
diff --git a/gradle_jre14/Dockerfile b/gradle_jre14/Dockerfile
index cbb4c1f..c3d2d20 100644
--- a/gradle_jre14/Dockerfile
+++ b/gradle_jre14/Dockerfile
@@ -19,6 +19,15 @@ VOLUME /home/gradle/.gradle
 WORKDIR /home/gradle
 
 RUN apt-get update \
+    && apt-get install --yes --no-install-recommends gnupg \
+    && key='E1DD270288B4E6030699E45FA1715D88E1DF1F24' \
+    && export GNUPGHOME="$(mktemp -d)" \
+    && gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \
+    && gpg --batch --armor --export "$key" > /etc/apt/trusted.gpg.d/git-ppa.gpg.asc \
+    && gpgconf --kill all \
+    && rm -rf "$GNUPGHOME" \
+    && echo 'deb http://ppa.launchpad.net/git-core/ppa/ubuntu bionic main' > /etc/apt/sources.list.d/git-core-ppa.list \
+    && apt-get update \
     && apt-get install --yes --no-install-recommends \
         fontconfig \
         unzip \
diff --git a/gradle_latest/Dockerfile b/gradle_latest/Dockerfile
index b2b6083..a4f5fb6 100644
--- a/gradle_latest/Dockerfile
+++ b/gradle_latest/Dockerfile
@@ -19,6 +19,15 @@ VOLUME /home/gradle/.gradle
 WORKDIR /home/gradle
 
 RUN apt-get update \
+    && apt-get install --yes --no-install-recommends gnupg \
+    && key='E1DD270288B4E6030699E45FA1715D88E1DF1F24' \
+    && export GNUPGHOME="$(mktemp -d)" \
+    && gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \
+    && gpg --batch --armor --export "$key" > /etc/apt/trusted.gpg.d/git-ppa.gpg.asc \
+    && gpgconf --kill all \
+    && rm -rf "$GNUPGHOME" \
+    && echo 'deb http://ppa.launchpad.net/git-core/ppa/ubuntu bionic main' > /etc/apt/sources.list.d/git-core-ppa.list \
+    && apt-get update \
     && apt-get install --yes --no-install-recommends \
         fontconfig \
         unzip \

keeganwitt · 2020-10-13T18:20:49Z

Well, it's less flakey than before, but 1 of the pulls from PPA timed out. Hopefully AdoptOpenJDK base will be updated soon, so this won't be very long-lived anyway...

github-actions bot added the library/amazoncorretto label Oct 11, 2020

keeganwitt mentioned this pull request Oct 12, 2020

git upgrade gradle/docker-gradle#151

Closed

keeganwitt force-pushed the gradle branch from 9edd883 to f28652a Compare October 12, 2020 17:15

tianon removed the library/amazoncorretto label Oct 12, 2020

github-actions bot added the library/gradle label Oct 12, 2020

tianon force-pushed the gradle branch from f28652a to 4f21b55 Compare October 12, 2020 21:59

keeganwitt force-pushed the gradle branch from 4f21b55 to 065de9b Compare October 13, 2020 14:26

Update Git

bc0a943

keeganwitt force-pushed the gradle branch from 065de9b to bc0a943 Compare October 13, 2020 18:10

yosifkit merged commit 390fbbe into docker-library:master Oct 13, 2020

yosifkit mentioned this pull request Oct 22, 2020

New scripts for building the Zend Server Docker images to make the usa… #8791

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Update Git#8881

Update Git#8881
yosifkit merged 1 commit intodocker-library:masterfrom
keeganwitt:gradle

keeganwitt commented Oct 11, 2020

Uh oh!

tianon commented Oct 12, 2020

Uh oh!

keeganwitt commented Oct 12, 2020

Uh oh!

tianon commented Oct 12, 2020

Uh oh!

tianon commented Oct 12, 2020

Uh oh!

keeganwitt commented Oct 13, 2020

Uh oh!

yosifkit commented Oct 13, 2020

Uh oh!

keeganwitt commented Oct 13, 2020

Uh oh!

keeganwitt commented Oct 13, 2020

Uh oh!

tianon commented Oct 13, 2020

Uh oh!

github-actions bot commented Oct 13, 2020

Uh oh!

keeganwitt commented Oct 13, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Comments

Conversation

keeganwitt commented Oct 11, 2020

Uh oh!

tianon commented Oct 12, 2020

Uh oh!

keeganwitt commented Oct 12, 2020

Uh oh!

tianon commented Oct 12, 2020

Uh oh!

tianon commented Oct 12, 2020

Uh oh!

keeganwitt commented Oct 13, 2020

Uh oh!

yosifkit commented Oct 13, 2020

Uh oh!

keeganwitt commented Oct 13, 2020

Uh oh!

keeganwitt commented Oct 13, 2020

Uh oh!

tianon commented Oct 13, 2020

Uh oh!

github-actions bot commented Oct 13, 2020

Uh oh!

keeganwitt commented Oct 13, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants