fixing and optimizing scripts

Author: fabiocicerchia

docker-build.sh

@@ -25,39 +25,46 @@ function build() {
         return
     fi
 
-    VCS_REF=$(git rev-parse --short HEAD)
-    docker build --build-arg BUILD_DATE=$(date +%Y%m%d%H%M%S) --build-arg BUILD_VERSION=$(date +%s) --build-arg VCS_REF=$VCS_REF -t fabiocicerchia/nginx-lua:$PATCH-$OS$OS_VER -f $DOCKERFILE .
-    IMAGE_ID=$(docker image ls -q fabiocicerchia/nginx-lua:$PATCH-$OS$OS_VER)
-
+    TAGS="-t fabiocicerchia/nginx-lua:$PATCH-$OS$OS_VER"
     if [ "$VER_TAGS$OS_TAGS$DEFAULT" == "111" ]; then
-        docker tag $IMAGE_ID fabiocicerchia/nginx-lua:$MAJOR
-        docker tag $IMAGE_ID fabiocicerchia/nginx-lua:$MINOR
-        docker tag $IMAGE_ID fabiocicerchia/nginx-lua:$PATCH
-        docker tag $IMAGE_ID fabiocicerchia/nginx-lua:latest
+        TAGS="$TAGS -t fabiocicerchia/nginx-lua:$MAJOR"
+        TAGS="$TAGS -t fabiocicerchia/nginx-lua:$MINOR"
+        TAGS="$TAGS -t fabiocicerchia/nginx-lua:$PATCH"
+        TAGS="$TAGS -t fabiocicerchia/nginx-lua:latest"
     fi
 
     if [ "$VER_TAGS$OS_TAGS" == "11" ]; then
-        docker tag $IMAGE_ID fabiocicerchia/nginx-lua:$MAJOR-$OS
-        docker tag $IMAGE_ID fabiocicerchia/nginx-lua:$MAJOR-$OS$OS_VER
+        TAGS="$TAGS -t fabiocicerchia/nginx-lua:$MAJOR-$OS"
+        TAGS="$TAGS -t fabiocicerchia/nginx-lua:$MAJOR-$OS$OS_VER"
     fi
 
     if [ "$OS_TAGS" == "1" ]; then
-        docker tag $IMAGE_ID fabiocicerchia/nginx-lua:$MINOR-$OS
-        docker tag $IMAGE_ID fabiocicerchia/nginx-lua:$PATCH-$OS
-        docker tag $IMAGE_ID fabiocicerchia/nginx-lua:$MINOR-$OS$OS_VER
+        TAGS="$TAGS -t fabiocicerchia/nginx-lua:$MINOR-$OS"
+        TAGS="$TAGS -t fabiocicerchia/nginx-lua:$PATCH-$OS"
+        TAGS="$TAGS -t fabiocicerchia/nginx-lua:$MINOR-$OS$OS_VER"
     fi
+
+    BUILD_DATE=$(date +%Y%m%d%H%M%S)
+    BUILD_VERSION=$(date +%s)
+    VCS_REF=$(git rev-parse --short HEAD)
+    docker build \
+        --build-arg BUILD_DATE=$BUILD_DATE \
+        --build-arg BUILD_VERSION=$BUILD_VERSION \
+        --build-arg VCS_REF=$VCS_REF \
+        $TAGS \
+        -f $DOCKERFILE .
 }
 
 set -x
 
 OS=$1
 VERSIONS=()
-if [ "$OS" == "alpine" ]; then VERSIONS=$ALPINE
-elif [ "$OS" == "amazonlinux" ]; then VERSIONS=$AMAZONLINUX
-elif [ "$OS" == "centos" ]; then VERSIONS=$CENTOS
-elif [ "$OS" == "debian" ]; then VERSIONS=$DEBIAN
-elif [ "$OS" == "fedora" ]; then VERSIONS=$FEDORA
-elif [ "$OS" == "ubuntu" ]; then VERSIONS=$UBUNTU
+if [ "$OS" == "alpine" ]; then VERSIONS=("${ALPINE[@]}")
+elif [ "$OS" == "amazonlinux" ]; then VERSIONS=("${AMAZONLINUX[@]}")
+elif [ "$OS" == "centos" ]; then VERSIONS=("${CENTOS[@]}")
+elif [ "$OS" == "debian" ]; then VERSIONS=("${DEBIAN[@]}")
+elif [ "$OS" == "fedora" ]; then VERSIONS=("${FEDORA[@]}")
+elif [ "$OS" == "ubuntu" ]; then VERSIONS=("${UBUNTU[@]}")
 fi
 
 NLEN=${#NGINX[@]}

docker-generate.sh

@@ -21,14 +21,14 @@ function push() {
     MINOR=$MAJOR.$(echo $NGINX_VER | cut -d '.' -f 2)
     PATCH=$NGINX_VER
 
-    docker_tag_exists fabiocicerchia/nginx-lua $MAJOR-$OS$OS_VER || docker push fabiocicerchia/nginx-lua:$MAJOR-$OS$OS_VER
-    docker_tag_exists fabiocicerchia/nginx-lua $MINOR-$OS$OS_VER || docker push fabiocicerchia/nginx-lua:$MINOR-$OS$OS_VER
-    docker_tag_exists fabiocicerchia/nginx-lua $PATCH-$OS$OS_VER || docker push fabiocicerchia/nginx-lua:$PATCH-$OS$OS_VER
-
     if docker_tag_exists fabiocicerchia/nginx-lua $PATCH-$OS$OS_VER; then
         return
     fi
 
+    docker push fabiocicerchia/nginx-lua:$MAJOR-$OS$OS_VER
+    docker push fabiocicerchia/nginx-lua:$MINOR-$OS$OS_VER
+    docker push fabiocicerchia/nginx-lua:$PATCH-$OS$OS_VER
+
     if [ "$VER_TAGS$OS_TAGS$DEFAULT" == "111" ]; then
         docker push fabiocicerchia/nginx-lua:$MAJOR
         docker push fabiocicerchia/nginx-lua:$MINOR

docker-push.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+source supported_versions
+
+function init_dockerfile() {
+    DOCKERFILE_PATH=nginx/$NGINX_VER/$OS/$OS_VER
+    DOCKERFILE=$DOCKERFILE_PATH/Dockerfile
+
+    mkdir -p $DOCKERFILE_PATH 2> /dev/null
+    cp tpl/Dockerfile.$OS $DOCKERFILE
+
+    sed -i "" "s/{{DOCKER_IMAGE}}/fabiocicerchia\/nginx-lua/" $DOCKERFILE
+    sed -i "" "s/{{DOCKER_IMAGE_OS}}/$OS/"                    $DOCKERFILE
+    sed -i "" "s/{{DOCKER_IMAGE_TAG}}/$OS_VER/"               $DOCKERFILE
+    sed -i "" "s/{{VER_NGINX}}/$NGINX_VER/"                   $DOCKERFILE
+}
+
+set -x
+
+for NGINX_VER in "${NGINX[@]}"; do
+
+    OS=alpine
+    for OS_VER in "${ALPINE[@]}"; do init_dockerfile; done
+
+    OS=amazonlinux
+    for OS_VER in "${AMAZONLINUX[@]}"; do init_dockerfile; done
+
+    OS=centos
+    for OS_VER in "${CENTOS[@]}"; do init_dockerfile; done
+
+    OS=debian
+    for OS_VER in "${DEBIAN[@]}"; do init_dockerfile; done
+
+    OS=fedora
+    for OS_VER in "${FEDORA[@]}"; do init_dockerfile; done
+
+    OS=ubuntu
+    for OS_VER in "${UBUNTU[@]}"; do init_dockerfile; done
+
+done