Commit 39f1a2bb authored by nimrod's avatar nimrod
Browse files

Cleanup APT sources. 

- Single directory.
- Use the newer format for the Hashicorp repo.
parent 2d282adc

.dockerignore

+1 −4
Original line number Diff line number Diff line 
*

!mongodb.sources

!google-cloud.sources

!heroku.list

!hashicorp.list

!sources.d/*

!bfg

!bash_completion.d/*

Dockerfile

+1 −4
Original line number Diff line number Diff line
@@ -20,13 +20,10 @@ RUN apt-get update && \ 
    && \

    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 --chown=root:root mongodb.sources /etc/apt/sources.list.d/

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

COPY --chown=root:root google-cloud.sources /etc/apt/sources.list.d/

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

COPY --chown=root:root heroku.list /etc/apt/sources.list.d/

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

COPY --chown=root:root hashicorp.list /etc/apt/sources.list.d/

COPY --chown=root:root sources.d/* /etc/apt/sources.list.d/

# hadolint ignore=DL3008,DL3013,DL3027

RUN apt-get update && \

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

hashicorp.list

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
deb [signed-by=/usr/share/keyrings/hashicorp.gpg] https://apt.releases.hashicorp.com buster main

sources.d/hashicorp.sources

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

URIs: https://apt.releases.hashicorp.com

Suites: buster

Components: main

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