mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
Now matches docker version instead of our own versions. (#576)
This commit is contained in:
committed by
Reed Allman
parent
ec7062dc8c
commit
140aab4c94
@@ -1,4 +1,4 @@
|
||||
FROM docker:17.09-dind
|
||||
FROM docker:17.11-dind
|
||||
|
||||
RUN apk add --no-cache ca-certificates
|
||||
|
||||
|
||||
@@ -1,4 +1,16 @@
|
||||
# Docker-in-Docker Base Image
|
||||
|
||||
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"]
|
||||
```
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
0.1.6
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user