alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Now matches docker version instead of our own versions. (#576)

Browse Source
This commit is contained in:
Travis Reeder
2017-12-06 15:51:00 -08:00
committed by Reed Allman
parent ec7062dc8c
commit 140aab4c94
4 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/dind/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM docker:17.09-dind
FROM docker:17.11-dind
RUN apk add --no-cache ca-certificates

18
images/dind/README.md
View File

@@ -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"]
```

1
images/dind/VERSION
View File

@@ -1 +0,0 @@
0.1.6

6
images/dind/release.sh
View File

@@ -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