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

Better versioning for dind image. (#666)

Browse Source 
* Better versioning for dind image.

* Updated dind image used in main build
This commit is contained in:
Travis Reeder
2018-01-09 15:33:26 -08:00
committed by Reed Allman
parent 7a9ead098f
commit eef1025e93
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@@ -6,7 +6,7 @@ ADD . $D
RUN cd $D && go build -o fn-alpine && cp fn-alpine /tmp/ RUN cd $D && go build -o fn-alpine && cp fn-alpine /tmp/
# final stage # final stage
FROM fnproject/dind FROM fnproject/dind:17.12
WORKDIR /app WORKDIR /app
COPY --from=build-env /tmp/fn-alpine /app/functions COPY --from=build-env /tmp/fn-alpine /app/fnserver
CMD ["./functions"] CMD ["./fnserver"]

2
images/dind/Dockerfile
View File

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

15
images/dind/release.sh
View File

@@ -1,12 +1,19 @@
set -e set -ex
./build.sh # ./build.sh
# Match version with Docker version # Match version with Docker version
version=$(docker run --rm -v "$PWD":/app treeder/bump --extract --input "`docker -v`") version=$(docker run --rm -v "$PWD":/app treeder/bump --extract --input "`docker -v`")
echo "Version: $version" echo "Version: $version"
M=$(docker run --rm treeder/bump --format M --input "$version")
Mm=$(docker run --rm treeder/bump --format M.m --input "$version")
docker tag fnproject/dind:latest fnproject/dind:$version docker tag fnproject/dind:latest fnproject/dind:$version
# be nice to have bump image do all of this tagging and pushing too (mount docker sock and do it all)
docker push fnproject/dind:latest docker tag fnproject/dind:$version fnproject/dind:$Mm
docker tag fnproject/dind:$version fnproject/dind:$M
docker push fnproject/dind:$version docker push fnproject/dind:$version
docker push fnproject/dind:$Mm
docker push fnproject/dind:$M
docker push fnproject/dind:latest