diff --git a/.dockerignore b/.dockerignore index 8f451094af8b23763550a96607dbcdb1d86af9b2..4d72fb9d82751121468161fa2ba47978273fb218 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,5 @@ * !sources.d/* +!preferences.d/* !bfg !bash_completion.d/* diff --git a/Dockerfile b/Dockerfile index 8a4e6ac108fdd5d3afa37859d49d466ac1d310a8..4ef38de085e64d38f4b1b59f6fd0d0fdd59c3d2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,8 @@ RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg > google-cloud.gp RUN curl https://cli-assets.heroku.com/apt/release.key | gpg --dearmor > heroku.gpg # hadolint ignore=DL4006 RUN curl https://apt.releases.hashicorp.com/gpg | gpg --dearmor > hashicorp.gpg +# hadolint ignore=DL4006 +RUN curl https://dl.cloudsmith.io/public/cloudposse/packages/gpg.7333C6FDEFA717CC.key | gpg --dearmor > cloudposse.gpg FROM registry.hub.docker.com/library/buildpack-deps:testing SHELL ["/bin/bash", "-o", "pipefail", "-xc"] @@ -22,7 +24,9 @@ COPY --from=repo-key /gnupghome/mongodb.gpg /usr/share/keyrings/mongodb.gpg COPY --from=repo-key /gnupghome/google-cloud.gpg /usr/share/keyrings/google-cloud.gpg COPY --from=repo-key /gnupghome/heroku.gpg /usr/share/keyrings/heroku.gpg COPY --from=repo-key /gnupghome/hashicorp.gpg /usr/share/keyrings/hashicorp.gpg +COPY --from=repo-key /gnupghome/cloudposse.gpg /usr/share/keyrings/cloudposse.gpg COPY --chown=root:root sources.d/* /etc/apt/sources.list.d/ +COPY --chown=root:root preferences.d/* /etc/apt/preferences.d/ # hadolint ignore=DL3008,DL3013,DL3027 RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \ diff --git a/preferences.d/cloudposse b/preferences.d/cloudposse new file mode 100644 index 0000000000000000000000000000000000000000..f116112980dcc30dcb4f5ca59e29d085a99b5756 --- /dev/null +++ b/preferences.d/cloudposse @@ -0,0 +1,3 @@ +Package: * +Pin: release o=https://cloudsmith.io +Pin-Priority: 400 diff --git a/sources.d/cloudposse.sources b/sources.d/cloudposse.sources new file mode 100644 index 0000000000000000000000000000000000000000..4dd3a48b3001293826cec24b5de62519ee9917e5 --- /dev/null +++ b/sources.d/cloudposse.sources @@ -0,0 +1,5 @@ +Types: deb deb-src +URIs: https://dl.cloudsmith.io/public/cloudposse/packages/deb/debian +Suites: any-version +Components: main +Signed-By: /usr/share/keyrings/cloudposse.gpg