diff --git a/deploy/asapo_services/Dockerfile b/deploy/asapo_services/Dockerfile index b58a5013cbd42b9cb8d0af9b3f69a666b8cdb783..6f6e8ae7b52b3d16029c57f634fb1c7af0f51cd1 100644 --- a/deploy/asapo_services/Dockerfile +++ b/deploy/asapo_services/Dockerfile @@ -1,37 +1,6 @@ -FROM debian:bullseye - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - gnupg \ - ; - -RUN curl -fsSL https://apt.releases.hashicorp.com/gpg | gpg --dearmor > /usr/share/keyrings/nomad-hashicorp-archive-keyring.gpg -RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/nomad-hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com bullseye main" >> /etc/apt/sources.list - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - supervisor \ - gnupg-agent \ - dnsutils \ - nomad \ - consul \ - terraform \ - iproute2 \ - ; \ - rm -rf /var/lib/apt/lists/* +FROM gitlab.desy.de:5555/asapo/asapo/asapo-nomad-consul:latest COPY scripts/ /var/asapo/ -COPY jobs-* /usr/bin/ -COPY asapo-wait-service /usr/bin/ -COPY supervisord.conf /etc/ -COPY *.py /etc/asapo/ -COPY *.hcl.tpl /etc/asapo/ - -RUN mkdir -p /var/log/supervisord/ /etc/consul.d /etc/nomad.d /var/nomad /var/consul RUN cd /var/asapo && terraform init