From 5d748b36b1807574c2c32d857810311e8ab01145 Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Fri, 26 Mar 2021 22:19:00 +0000 Subject: [PATCH] we don't use imagewrangler anymore --- images/imagewrangler/Dockerfile | 49 --------------------------------- images/imagewrangler/post.sh | 3 -- images/imagewrangler/pre.sh | 6 ---- images/imagewrangler/type.txt | 1 - 4 files changed, 59 deletions(-) delete mode 100644 images/imagewrangler/Dockerfile delete mode 100755 images/imagewrangler/post.sh delete mode 100755 images/imagewrangler/pre.sh delete mode 100644 images/imagewrangler/type.txt diff --git a/images/imagewrangler/Dockerfile b/images/imagewrangler/Dockerfile deleted file mode 100644 index fdb779d..0000000 --- a/images/imagewrangler/Dockerfile +++ /dev/null @@ -1,49 +0,0 @@ -ARG REPO_LOCATION - -FROM ${REPO_LOCATION}minideb AS builder - -RUN install_packages git curl openssh-client ca-certificates - -RUN echo "deb [arch=armhf] http://download.docker.com/linux/debian buster stable" >/etc/apt/sources.list.d/docker.list -RUN curl -fsSL https://download.docker.com/linux/debian/gpg >/etc/apt/trusted.gpg.d/docker.asc - -COPY imagewrangler_ed25519 /tmp/imagewrangler_ed25519 -RUN ssh-keyscan -H git.starbeamrainbowlabs.com >/tmp/known_hosts - -# Invalidate the cache to force Docker to pull the latest commit -ADD datetime.txt /tmp/datetime.txt -RUN GIT_SSH_COMMAND="ssh -i /tmp/imagewrangler_ed25519 -o PreferredAuthentications=publickey -o UserKnownHostsFile=/tmp/known_hosts" git clone git@git.starbeamrainbowlabs.com:sbrl/cluster-config.git /srv -WORKDIR /srv -RUN git submodule update --init - -############################################################################### - -FROM ${REPO_LOCATION}minideb - -# Docker apt repo -COPY --from=builder /etc/apt/trusted.gpg.d/docker.asc /etc/apt/trusted.gpg.d/docker.asc -COPY --from=builder /etc/apt/sources.list.d/docker.list /etc/apt/sources.list.d/docker.list - -# Everything from make onwards is needed for minideb -RUN install_packages curl jq docker-ce-cli ca-certificates fakeroot fakechroot git - -# These will probably invalidate the cache, so we install the packages above first -COPY --from=builder /srv/lantern-build-engine /srv/lantern-build-engine -COPY --from=builder /srv/docker /srv/docker -COPY --from=builder /srv/scripts /srv/scripts - -# Note that we chown here because COPY --chown is apparently unreliable :-( -RUN groupadd --gid 995 docker && \ - useradd --no-create-home --system --uid 50 --groups docker imagewrangler && \ - chown -R 50:995 /srv/docker && \ - mkdir /mnt/data_dir - -# We need the docker socket to enable us to start containers in order to check them -VOLUME /run/docker.sock -VOLUME /mnt/data_dir - -# 995 = the docker group on docker.sock -USER imagewrangler:docker - -WORKDIR /srv/scripts -ENTRYPOINT [ "/bin/bash", "./imagewrangler.sh", "check" ] diff --git a/images/imagewrangler/post.sh b/images/imagewrangler/post.sh deleted file mode 100755 index 4f9a7a7..0000000 --- a/images/imagewrangler/post.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -rm -f imagewrangler_ed25519 imagewrangler_ed25519.pub dateetime.txt; diff --git a/images/imagewrangler/pre.sh b/images/imagewrangler/pre.sh deleted file mode 100755 index 7c6eb0a..0000000 --- a/images/imagewrangler/pre.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -cp /mnt/shared/imagewrangler/imagewrangler_ed25519 . -cp /mnt/shared/imagewrangler/imagewrangler_ed25519.pub . - -date >./datetime.txt diff --git a/images/imagewrangler/type.txt b/images/imagewrangler/type.txt deleted file mode 100644 index bdb9670..0000000 --- a/images/imagewrangler/type.txt +++ /dev/null @@ -1 +0,0 @@ -docker