Commit 362d5ac3 authored by nimrod's avatar nimrod
Browse files

Replace Homebrew source-only packages. 

- First of all, Hashicorp now has a proper Debian repository with a lot
  of their tools avaiable. Use that instead.
- Replace some of the other packages manaully.
- Remove the buildpack package completely (I never used it, I wanted to
  give it a try sometime).
parent af8ce8ce

.dockerignore

+1 −0
Original line number Diff line number Diff line
@@ -2,4 +2,5 @@ 
!mongodb.sources

!google-cloud.sources

!heroku.list

!hashicorp.list

!bfg

Dockerfile

+10 −5
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ RUN curl https://www.mongodb.org/static/pgp/server-4.4.asc | gpg --dearmor > mon 
RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg > google-cloud.gpg

# hadolint ignore=DL4006

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



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

SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -23,6 +25,8 @@ COPY --from=repo-key /gnupghome/google-cloud.gpg /usr/share/keyrings/google-clou 
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/

# hadolint ignore=DL3008,DL3013,DL3027

RUN apt-get update && \

    DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
@@ -36,6 +40,7 @@ RUN apt-get update && \ 
        bzr \

        cmake \

        composer \

        consul \

        dbus-x11 \

        default-jdk-headless \

        default-mysql-client \
@@ -93,6 +98,7 @@ RUN apt-get update && \ 
        nodejs \

        npm \

        ostree \

        packer \

        php-cli \

        podman \

        postgresql-client \
@@ -114,12 +120,14 @@ RUN apt-get update && \ 
        task-hebrew \

        task-ssh-server \

        telnet \

        terraform \

        time \

        tmux \

        ttyrec \

        udftools \

        unison \

        vagrant \

        vault \

        vcdimager \

        vim-nox \

        w3m-img \
@@ -134,7 +142,6 @@ RUN apt-get update && \ 
        buildpacks/tap/pack \

        docker-machine \

        envconsul \

        fabric-completion \

        gh \

        gomplate \

        hugo \
@@ -142,13 +149,9 @@ RUN apt-get update && \ 
        kops \

        kustomize \

        minikube \

        packer \

        packer-completion \

        rke \

        skaffold \

        terraform \

        terragrunt \

        vault \

    && \

    brew cleanup --prune=all -s && \

    find /usr/local/etc/bash_completion.d/ -find f exec ln --symbolic --target /etc/bash_completion.d/ '{}' \; && \
@@ -235,6 +238,8 @@ RUN apt-get update && \ 
    register-python-argcomplete gitlab > /etc/bash_completion.d/gitlab && \

    wget https://raw.githubusercontent.com/docker/compose/1.29.2/contrib/completion/bash/docker-compose -O /etc/bash_completion.d/docker-compose && \

    wget https://raw.githubusercontent.com/ansible-community/molecule/1.25.1/asset/bash_completion/molecule.bash-completion.sh -O /etc/bash_completion.d/molecule && \

    wget https://raw.githubusercontent.com/kbakulin/fabric-completion/master/fabric-completion.bash -O /etc/bash_completion.d/fabric && \

    wget https://github.com/mrolli/packer-bash-completion/blob/master/packer -O /etc/bash_completion.d/packer && \

    mkdir /etc/krb5.conf.d && \

    echo 'VARIANT_ID=container' >> /etc/os-release && \

    touch /etc/localtime && \

hashicorp.list

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