Commit d57a36d6 authored by nimrod's avatar nimrod
Browse files

Google Cloud SDK and modernize APT sources. 

- Use the new format for APT sources and keyrings.
- Installl the Google Cloud SDK.
- Use the full URLs for images.
parent 71bbb14d

.dockerignore

0 → 100644
+3 −0
Original line number Diff line number Diff line 
*

!mongodb.sources

!google-cloud.sources

Dockerfile

+22 −5
Original line number Diff line number Diff line 
FROM buildpack-deps:bullseye

FROM registry.hub.docker.com/library/buildpack-deps:testing as repo-key

WORKDIR /gnupghome

ENV GNUPGHOME /gnupghome

# hadolint ignore=DL4006

RUN curl https://www.mongodb.org/static/pgp/server-4.4.asc | gpg --dearmor > mongodb.gpg

RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg > google-cloud.gpg



FROM registry.hub.docker.com/library/buildpack-deps:testing

# hadolint ignore=DL3008

RUN apt-get update && \

    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

        apt-transport-https \

        ca-certificates \

        gnupg \

    && \

    rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/*

COPY --from=repo-key /gnupghome/mongodb.gpg /usr/share/keyrings/mongodb.gpg

COPY mongodb.sources /etc/apt/sources.list.d/

COPY --from=repo-key /gnupghome/google-cloud.gpg /usr/share/keyrings/google-cloud.gpg

COPY google-cloud.sources /etc/apt/sources.list.d/

# hadolint ignore=DL3008,DL3013

RUN wget https://www.mongodb.org/static/pgp/server-4.4.asc -O /tmp/mongo.asc && \

    apt-key add /tmp/mongo.asc && \

    echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" > /etc/apt/sources.list.d/mongodb-org-4.4.list && \

    apt-get update && \

RUN apt-get update && \

    DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \

        apache2-utils \

        bash-completion \
@@ -31,6 +47,7 @@ RUN wget https://www.mongodb.org/static/pgp/server-4.4.asc -O /tmp/mongo.asc && 
        gir1.2-ostree-1.0 \

        gnupg \

        golang \

        google-cloud-sdk \

        go-md2man \

        gpgv \

        hunspell \

google-cloud.sources

0 → 100644
+5 −0
Original line number Diff line number Diff line 
Types: deb

URIs: https://packages.cloud.google.com/apt

Suites: cloud-sdk

Components: main

Signed-By: /usr/share/keyrings/google-cloud.gpg

mongodb.sources

0 → 100644
+5 −0
Original line number Diff line number Diff line 
Types: deb

URIs: https://repo.mongodb.org/apt/debian

Suites: buster/mongodb-org/4.4

Components: main

Signed-By: /usr/share/keyrings/mongodb.gpg