commit 884c0508fcf04a5a5bdda57f1b46bec24d7b77f0 Author: Ambrose Chua Date: Sat May 15 19:26:49 2021 +0800 Initial commit diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..f8e70d2 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,10 @@ +ARG base=concourse/concourse:latest +FROM ${base} + +RUN apt-get update \ + && apt-get install -y \ + jq \ + && mv /usr/local/concourse/bin/runc /usr/local/concourse/bin/runc-original + +ENV RUNC=/usr/local/concourse/bin/runc-original +COPY runc-wrapper /usr/local/concourse/bin/runc diff --git a/Dockerfile.dev b/Dockerfile.dev new file mode 100644 index 0000000..6141ff4 --- /dev/null +++ b/Dockerfile.dev @@ -0,0 +1,9 @@ +FROM concourse/concourse-dev:latest + +RUN apt-get update \ + && apt-get install -y \ + jq \ + && mv /usr/local/concourse/bin/runc /usr/local/concourse/bin/runc-original + +ENV RUNC=/usr/local/concourse/bin/runc-original +COPY runc-wrapper /usr/local/concourse/bin/runc diff --git a/Dockerfile.latest b/Dockerfile.latest new file mode 100644 index 0000000..87443bd --- /dev/null +++ b/Dockerfile.latest @@ -0,0 +1,9 @@ +FROM concourse/concourse:latest + +RUN apt-get update \ + && apt-get install -y \ + jq \ + && mv /usr/local/concourse/bin/runc /usr/local/concourse/bin/runc-original + +ENV RUNC=/usr/local/concourse/bin/runc-original +COPY runc-wrapper /usr/local/concourse/bin/runc diff --git a/README.md b/README.md new file mode 100644 index 0000000..41754cb --- /dev/null +++ b/README.md @@ -0,0 +1,12 @@ + +# `serverwentdown/concourse-kvm` + +Ugly patch to concourse's Docker image to mount the KVM device, until concourse/concourse#2784 is resolved. + +## Tags + +- [`latest`](Dockerfile.latest): Built from `concourse/concourse:latest` +- [`dev`](Dockerfile.dev): Built from `concourse/concourse-dev:latest` + + + diff --git a/runc-wrapper b/runc-wrapper new file mode 100644 index 0000000..7e88c00 --- /dev/null +++ b/runc-wrapper @@ -0,0 +1,10 @@ +#!/bin/sh + +RUNC=${RUNC:=runc} + +if [ -f config.json ]; then + mv config.json config.old.json + jq -c '.mounts |= . + [{ "destination": "/dev/kvm", "type": "bind", "source": "/dev/kvm", "options": [ "bind", "rw" ] }]' config.old.json > config.json +fi + +exec $RUNC "$@"