From bb7952420cbdb0744a59540cd8c5cbcc587ecaee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Hedenstr=C3=B6m?= <erik@codemate.se> Date: Fri, 14 Mar 2014 15:21:58 +0100 Subject: [PATCH] Removed build and push steps from docker scripts --- install/00_base.sh | 0 install/12_chrome_xvfb.sh | 0 install/41_rebar.sh | 0 install/42_relx.sh | 0 install/docker/docker-build.sh | 37 ---------------------------------- install/docker/docker-clean.sh | 17 ++++++++++++++++ install/docker/docker-info.sh | 18 +++++++++++++++++ 7 files changed, 35 insertions(+), 37 deletions(-) mode change 100644 => 100755 install/00_base.sh mode change 100644 => 100755 install/12_chrome_xvfb.sh mode change 100644 => 100755 install/41_rebar.sh mode change 100644 => 100755 install/42_relx.sh delete mode 100644 install/docker/docker-build.sh create mode 100644 install/docker/docker-clean.sh create mode 100644 install/docker/docker-info.sh diff --git a/install/00_base.sh b/install/00_base.sh old mode 100644 new mode 100755 diff --git a/install/12_chrome_xvfb.sh b/install/12_chrome_xvfb.sh old mode 100644 new mode 100755 diff --git a/install/41_rebar.sh b/install/41_rebar.sh old mode 100644 new mode 100755 diff --git a/install/42_relx.sh b/install/42_relx.sh old mode 100644 new mode 100755 diff --git a/install/docker/docker-build.sh b/install/docker/docker-build.sh deleted file mode 100644 index 37c6009..0000000 --- a/install/docker/docker-build.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash - -set -e # Exit on errors - -# Extract info from Dockerfile - -DOCKER_REPOSITORY=`grep '^# REPOSITORY' Dockerfile | awk -F ' ' '{print $3}'` -if [ ! ${DOCKER_REPOSITORY:+x} ]; then - DOCKER_REPOSITORY=`echo 'registry.codemate.se/'${PWD##*/}` -fi - -DOCKER_TAG=`grep '^# VERSION' Dockerfile | awk -F ' ' '{print $3}'` -if [ ! ${DOCKER_TAG:+x} ]; then - DOCKER_TAG='1.0.0' -fi - -# Build and publish image - -docker build -rm -t $DOCKER_REPOSITORY . -docker tag $DOCKER_REPOSITORY $DOCKER_REPOSITORY:$DOCKER_TAG -docker push $DOCKER_REPOSITORY - -set +e # Ignore errors - -# Remove stopped containers - -for CONTAINER in $(docker ps -a | awk '/Exit -?[0-9]+/ { print $1 }'); do - docker rm $CONTAINER -done - -# Remove untagged images - -for IMAGE in $(docker images | awk '/^<none>/ { print $3 }'); do - docker rmi $IMAGE -done - -exit 0 \ No newline at end of file diff --git a/install/docker/docker-clean.sh b/install/docker/docker-clean.sh new file mode 100644 index 0000000..4fc0fdd --- /dev/null +++ b/install/docker/docker-clean.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +set +e # Ignore errors + +# Remove stopped containers + +for CONTAINER in $(docker ps -a | awk '/Exit -?[0-9]+/ { print $1 }'); do + docker rm $CONTAINER +done + +# Remove untagged images + +for IMAGE in $(docker images | awk '/^<none>/ { print $3 }'); do + docker rmi $IMAGE +done + +exit 0 \ No newline at end of file diff --git a/install/docker/docker-info.sh b/install/docker/docker-info.sh new file mode 100644 index 0000000..6790a26 --- /dev/null +++ b/install/docker/docker-info.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +set -e # Exit on errors + +# Extract info from Dockerfile + +DOCKER_REPOSITORY=`grep '^# REPOSITORY' Dockerfile | awk -F ' ' '{print $3}'` +if [ ! ${DOCKER_REPOSITORY:+x} ]; then + DOCKER_REPOSITORY=`echo 'registry.codemate.se/'${PWD##*/}` +fi + +DOCKER_TAG=`grep '^# VERSION' Dockerfile | awk -F ' ' '{print $3}'` +if [ ! ${DOCKER_TAG:+x} ]; then + DOCKER_TAG='1.0.0' +fi + +export DOCKER_REPOSITORY +export DOCKER_TAG -- GitLab