Automation

scripts/build.sh

@@ -15,9 +15,10 @@ source "$DIR/../config"
 source "$DIR/libs.sh"
 
 usage() {
-    echo "Usage: $0 [-h] [-v] [-t: version] [image type, see below] " 1>&2; 
+    echo "Usage: $0 [-h] [-v] [-t: version] -I <webserver|worker> [image type, see below] " 1>&2; 
     echo "This script builds framework docker images, the following options are available:" 1>&2; 
     echo "  -h: This message" 1>&2; 
+    echo "  -I: Image (webserver or worker)" 1>&2; 
     echo "  Image types (at least one, otherwise the script does nothing)" 1>&2; 
     echo "     -a: All, same as ub" 1>&2; 
     echo "     -u: Unit" 1>&2; 
@@ -33,9 +34,13 @@ UNIT_MODE=0
 DEBUG_MODE=0
 
 TAG="local"
+TYPE="webserver"
 
-while getopts "t:hvaubd" o; do
+while getopts "I:t:hvaubd" o; do
     case "${o}" in
+        I) 
+            TYPE="${OPTARG}"
+            ;;
         b)
             BASE_MODE=1
             ;;
@@ -66,7 +71,6 @@ while getopts "t:hvaubd" o; do
 done
 
 
-
 cd ".."
 
 # STANDARD MODE
@@ -78,7 +82,7 @@ if [[ $BASE_MODE -gt 0 ]]; then
         OPTS+="v"
     fi
 
-    $DIR/generateDockerfile.sh -$OPTS -o $DOCKERFILE
+    $DIR/generateDockerfile.sh -I "${TYPE}" -$OPTS -o $DOCKERFILE
 
     msg "Building project image $TAG"
     docker build -t $PROJECT_REPOSITORY/$PROJECT_GROUP/$PROJECT_BUILDNAME:$TAG -f $DOCKERFILE .

scripts/core.sh

@@ -142,12 +142,16 @@ if  [[ $PUBLISH_MODE -eq 1 ]]; then
         BUILDOPT+="v"
         VERBOPT="-v"
     fi
-    msg "running ./build.sh -$BUILDOPT -t $TAG"
-    ./build.sh -$BUILDOPT -t $TAG
 
-    ./run-unit.sh $VERBOPT -t $TAG
+    # WEBSERVER 
+    msg "running ./build.sh -I webserver -$BUILDOPT -t $TAG-webserver"
+    ./build.sh -I webserver -$BUILDOPT -t "$TAG-webserver"
 
-    ./publish.sh $VERBOPT -t $TAG
+    ./run-unit.sh $VERBOPT -t "$TAG-webserver"
+
+    ./publish.sh $VERBOPT -t "$TAG-webserver"
+
+    
 
     if [[ $TAG_IMPLICIT -ne 1 ]]; then
         git tag $TAG

scripts/generateDockerfile.sh

@@ -22,6 +22,7 @@ usage() {
     echo "     -d: Debug" 1>&2; 
     echo "     -u: Unit" 1>&2; 
     echo "     -b: Base" 1>&2; 
+    echo "  -I: Image (webserver or worker)" 1>&2; 
     echo "  -i: Config Input File" 1>&2; 
     echo "  -o: Output file" 1>&2; 
     echo "  -v: Verbose" 1>&2; 
@@ -36,8 +37,13 @@ DEBUG_MODE=0
 UNIT_MODE=0
 BASE_MODE=0
 
-while getopts "i:o:hvdub" o; do
+TYPE="webserver"
+
+while getopts "i:o:I:hvdub" o; do
     case "${o}" in
+        I) 
+            TYPE="${OPTARG}"
+            ;;
         d)
             DEBUG_MODE=1
             SELECTED_MODES+=1
@@ -88,12 +94,12 @@ if [[ $OUTFILE == "" ]]; then
     usage
 fi
 
-STARTING_FILE="../cicd/dockerfiles/build.dockerfile"
+STARTING_FILE="../cicd/dockerfiles/${TYPE}/build.dockerfile"
 if [[ $DEBUG_MODE -eq 1 ]]; then
-    STARTING_FILE="../cicd/dockerfiles/debug.dockerfile"
+    STARTING_FILE="../cicd/dockerfiles/${TYPE}/debug.dockerfile"
 fi
 if [[ $UNIT_MODE -eq 1 ]]; then
-    STARTING_FILE="../cicd/dockerfiles/test.dockerfile"
+    STARTING_FILE="../cicd/dockerfiles/${TYPE}/test.dockerfile"
 fi
 msg "Using source file $STARTING_FILE"
 

scripts/latest-ver.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
 
+git pull 
 git tag -l --sort=-version:refname | head -n 1