Merge pull request #321 from eris-ltd/feature-smaller-docker-redux

Feature smaller docker redux

Dockerfile.deploy

@@ -4,12 +4,12 @@ MAINTAINER Monax <support@monax.io>
 ENV TARGET eris-db
 
 # runtime customization start here
-ADD ./eris-client $INSTALL_BASE
+COPY ./eris-client $INSTALL_BASE/eris-client
 COPY ./bin/start_eris_db $INSTALL_BASE/erisdb-wrapper
 # runtime customization end here
 
 # Get the binary from the artifact in pwd
-ADD ./$TARGET $INSTALL_BASE
+COPY ./"$TARGET"_build_artifact $INSTALL_BASE/$TARGET
 RUN chmod +x --recursive $INSTALL_BASE
 
 # Finalize

circle.yml

@@ -42,6 +42,7 @@ deployment:
     commands:
       - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
       - tests/build_tool.sh
+      - "docker tag quay.io/eris/db:build throw:build && docker rmi quay.io/eris/db:build"
       - docker push quay.io/eris/db
       - docs/build.sh master
   develop:
@@ -49,5 +50,6 @@ deployment:
     commands:
       - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
       - tests/build_tool.sh
+      - "docker rmi quay.io/eris/db:latest && docker tag quay.io/eris/db:build throw:build && docker rmi quay.io/eris/db:build"
       - docker push quay.io/eris/db
       - docs/build.sh

tests/build_tool.sh

@@ -36,12 +36,12 @@ release_maj=$(echo $release_min | cut -d . -f 1-2)
 
 # Build
 docker build -t $IMAGE:build $REPO
-docker run --rm --entrypoint cat $IMAGE:build /usr/local/bin/$TARGET > $REPO/$TARGET
+docker run --rm --entrypoint cat $IMAGE:build /usr/local/bin/$TARGET > $REPO/"$TARGET"_build_artifact
 docker run --rm --entrypoint cat $IMAGE:build /usr/local/bin/eris-client > $REPO/eris-client
 docker build -t $IMAGE:$release_min -f Dockerfile.deploy $REPO
 
 # Cleanup
-rm $REPO/$TARGET
+rm $REPO/"$TARGET"_build_artifact
 rm $REPO/eris-client
 
 # Extra Tags