diff --git a/images/dind/Dockerfile b/images/dind/Dockerfile index 3ceb25ed9..5e4893626 100644 --- a/images/dind/Dockerfile +++ b/images/dind/Dockerfile @@ -1,4 +1,4 @@ -FROM docker:17.09-dind +FROM docker:17.11-dind RUN apk add --no-cache ca-certificates diff --git a/images/dind/README.md b/images/dind/README.md index a264cd8e1..0d94ce016 100644 --- a/images/dind/README.md +++ b/images/dind/README.md @@ -1,4 +1,16 @@ -This is the base image for all docker-in-docker images. +# Docker-in-Docker Base Image -The difference between this and the official `docker` images are that this will choose the best -filesystem automatically. The official ones use `vfs` (bad) by default unless you pass in a flag. +This is the base image for all docker-in-docker images. + +The difference between this and the official `docker` images are that this will choose the best +filesystem automatically. The official ones use `vfs` (bad) by default unless you pass in a flag. + +## Usage + +Just use this as your base image and use CMD for your program, **NOT ENTRYPOINT**. This will handle the rest. + +```Dockerfile +FROM fnproject/dind +# OTHER STUFF +CMD ["./myproggie"] +``` diff --git a/images/dind/VERSION b/images/dind/VERSION deleted file mode 100644 index a19223320..000000000 --- a/images/dind/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.1.6 \ No newline at end of file diff --git a/images/dind/release.sh b/images/dind/release.sh index f2c0031ec..02bebe3f8 100755 --- a/images/dind/release.sh +++ b/images/dind/release.sh @@ -2,9 +2,9 @@ set -e ./build.sh -docker run --rm -v "$PWD":/app treeder/bump patch -version=`cat VERSION` -echo "version $version" +# Match version with Docker version +version=$(docker run --rm -v "$PWD":/app treeder/bump --extract --input "`docker -v`") +echo "Version: $version" docker tag fnproject/dind:latest fnproject/dind:$version