v0.6.1-beta

.gitignore

@@ -0,0 +1,2 @@
+tmp/
+cache/

commands/build.sh

@@ -107,7 +107,7 @@ non_debug_print " ${GREEN}done${RESET}\n"
 # export SCRIPT_VARS
 # export SCRIPT_VARS_ENV
 # export SCRIPT_VARS_BUILD_ARGS
-source "$ROOT_DIR/includes/get-script-vars.sh"
+SILENT=false source "$ROOT_DIR/includes/get-script-vars.sh"
 
 #
 # Build docker-compose.yml

commands/environment.sh

@@ -64,12 +64,12 @@ if ! $MODE_QUIET; then
     if ! $MODE_FORCE; then
         printf "Do you want to rebuild the project? (run with ${FLG_COL}--force${RESET} to always build)\n"
         printf "${YELLOW}WARNING${RESET}: This will ${RED}overwrite${RESET} existing docker files [y/N] "
-        read -n 1 -r
+        read -n 1 -r REPLY
         if [[ $REPLY =~ ^[Yy]$ ]]; then
             echo ""
-            bash $ENTRYPOINT build --force
+            bash $ENTRYPOINT up --force
         fi
     else
-        bash $ENTRYPOINT build --force
+        bash $ENTRYPOINT up --force
     fi
 fi

commands/lock.sh

@@ -60,12 +60,12 @@ if ! $MODE_NO_BUILD; then
     if ! $MODE_FORCE; then
         printf "Do you want to rebuild the project? (run with ${FLG_COL}--force${RESET} to always build)\n"
         printf "${YELLOW}WARNING${RESET}: This will ${RED}overwrite${RESET} existing docker files [y/N] "
-        read -n 1 -r
+        read -n 1 -r REPLY
         echo ""
         if [[ $REPLY =~ ^[Yy]$ ]]; then
-            bash $ENTRYPOINT build --force
+            bash $ENTRYPOINT up --force
         fi
     else
-        bash $ENTRYPOINT build --force
+        bash $ENTRYPOINT up --force
     fi
 fi

commands/modules.sh

@@ -26,6 +26,8 @@ MODE_NO_BUILD=false
 MODE_NO_SCRIPTS=false
 MODE_PRINT_ACTIVE_ONLY=false
 
+UP_ARGS=()
+
 while [[ "$#" -gt 0 ]]; do
     case $1 in
     -h | --help)
@@ -35,6 +37,9 @@ while [[ "$#" -gt 0 ]]; do
         printf "  ${FLG_COL}-a${RESET}, ${FLG_COL}--active${RESET}"
         printf "\t\tOnly list active modules\n"
 
+        printf "  ${FLG_COL}--no-chown${RESET}"
+        printf "\t\t\tPass --no-chown to 'sync' command\n"
+
         printf "  ${FLG_COL}--no-build${RESET}"
         printf "\t\t\tDon't attempt to build\n"
 
@@ -51,9 +56,14 @@ while [[ "$#" -gt 0 ]]; do
         ;;
     --no-build)
         MODE_NO_BUILD=true
+        UP_ARGS+=("--no-build")
         ;;
     --no-scripts)
         MODE_NO_SCRIPTS=true
+        UP_ARGS+=("--no-scripts")
+        ;;
+    --no-chown)
+        UP_ARGS+=("--no-chown")
         ;;
     -a | --active)
         MODE_PRINT_ACTIVE_ONLY=true
@@ -99,7 +109,7 @@ source "$ROOT_DIR/includes/blueprint/populate_env.sh" ""
 
 yq_read_array MODULES_TO_LOAD 'modules'
 EXPLICIT_MODULES_LIST=(${MODULES_TO_LOAD[@]})
-source "$ROOT_DIR/includes/resolve-dependencies.sh" ${MODULES_TO_LOAD[@]}
+SILENT=true source "$ROOT_DIR/includes/resolve-dependencies.sh" ${MODULES_TO_LOAD[@]}
 ACTIVE_MODULES_LIST=(${MODULES_TO_LOAD[@]})
 
 MODULES_LIST=()
@@ -221,6 +231,7 @@ else
     done
 fi
 
+script_paths=()
 needs_rebuild=false
 
 for MODULE in "${MODULES[@]}"; do
@@ -247,63 +258,59 @@ for MODULE in "${MODULES[@]}"; do
         ;;
     esac
 
-    if ! $MODE_QUIET && ! $MODE_NO_BUILD && $needs_rebuild; then
-        if ! $MODE_FORCE; then
-            printf "Do you want to rebuild the project? (run with ${FLG_COL}--force${RESET} to always build)\n"
-            printf "${YELLOW}WARNING${RESET}: This will ${RED}overwrite${RESET} existing docker files [y/N] "
-            read -n 1 -r
-            echo ""
-            if [[ $REPLY =~ ^[Yy]$ ]]; then
-                bash $ENTRYPOINT build --force
-            else
-                continue
-            fi
-        else
-            bash $ENTRYPOINT build --force
-        fi
+    # Add base blueprint module scripts first
+    path="$BLUEPRINT_DIR/modules/$MODULE/scripts/$ACTION.sh"
+    if [[ -f "$path" ]]; then
+        script_paths+=("$path")
     fi
 
-    if ! $MODE_NO_SCRIPTS; then
-        script_paths=()
-
-        # Add base blueprint module scripts first
-        path="$BLUEPRINT_DIR/modules/$MODULE/scripts/$ACTION.sh"
-        if [[ -f "$path" ]]; then
-            script_paths+=("$path")
-        fi
+    # Then add environment module scripts
+    path="$ENV_DIR/modules/$MODULE/scripts/$ACTION.sh"
+    if [[ -f "$path" ]]; then
+        script_paths+=("$path")
+    fi
+done
 
-        # Then add environment module scripts
-        path="$ENV_DIR/modules/$MODULE/scripts/$ACTION.sh"
-        if [[ -f "$path" ]]; then
-            script_paths+=("$path")
+if ! $MODE_QUIET && ! $MODE_NO_BUILD && $needs_rebuild; then
+    if ! $MODE_FORCE; then
+        printf "Do you want to rebuild the project? (run with ${FLG_COL}--force${RESET} to always build)\n"
+        printf "${YELLOW}WARNING${RESET}: This will ${RED}overwrite${RESET} existing docker files [y/N] "
+        read -n 1 -r REPLY
+        echo ""
+        if [[ $REPLY =~ ^[Yy]$ ]]; then
+            bash $ENTRYPOINT up --force ${UP_ARGS[@]}
         fi
+    else
+        bash $ENTRYPOINT up --force ${UP_ARGS[@]}
+    fi
+fi
 
-        status=0
+if ! $MODE_NO_SCRIPTS; then
+    status=0
 
-        # export SCRIPT_VARS
-        # export SCRIPT_VARS_ENV
-        # export SCRIPT_VARS_BUILD_ARGS
-        source "$ROOT_DIR/includes/get-script-vars.sh"
+    # export SCRIPT_VARS
+    # export SCRIPT_VARS_ENV
+    # export SCRIPT_VARS_BUILD_ARGS
+    source "$ROOT_DIR/includes/get-script-vars.sh"
 
-        for path in "${script_paths[@]}"; do
-            printf "Running script for module '$MODULE'...\n"
-            debug_print "Running script: ${path#$BLUEPRINT_DIR/}"
+    for path in "${script_paths[@]}"; do
+        printf "Running script for module '$MODULE'...\n"
+        debug_print "Running script: ${path#$BLUEPRINT_DIR/}"
 
-            PROGRAM="$(source "$ROOT_DIR/includes/script/prepare.sh" "$(cat "$path")")"
+        PROGRAM="$(source "$ROOT_DIR/includes/script/prepare.sh" "$(cat "$path")")"
 
-            command="bash -c \"$PROGRAM\""
-            bash $ENTRYPOINT "${SCRIPT_VARS_ENV[@]}" $DEFAULT_SERVICE exec "$command"
+        command="bash -c \"$PROGRAM\""
+        bash $ENTRYPOINT "${SCRIPT_VARS_ENV[@]}" $DEFAULT_SERVICE exec "$command"
 
-            status=$?
-
-            if [[ $status > 0 ]]; then
-                break
-            fi
-        done
+        status=$?
 
         if [[ $status > 0 ]]; then
-            printf -- "${RED}ERROR${RESET}: Module script returned non-zero code: ${path#$BLUEPRINT_DIR/}\n"
-            exit $status
+            break
         fi
+    done
+
+    if [[ $status > 0 ]]; then
+        printf -- "${RED}ERROR${RESET}: Module script returned non-zero code: ${path#$BLUEPRINT_DIR/}\n"
+        exit $status
     fi
-done
+fi

commands/new.sh

@@ -130,7 +130,7 @@ fi
 if ! [[ -f "$PWD/$PROJECT_BLUEPRINT_FILE" ]]; then
 
     # export BLUEPRINT_PATH
-    SILENT=false source "$ROOT_DIR/includes/blueprint/compile.sh" "$BLUEPRINT"
+    SILENT=true source "$ROOT_DIR/includes/blueprint/compile.sh" "$BLUEPRINT"
     debug_switch_context "NEW"
 
     # Populate project blueprint
@@ -195,8 +195,6 @@ if ! [[ -f "$PWD/$PROJECT_BLUEPRINT_FILE" ]]; then
         fi
     done
 
-    rm -f "$BLUEPRINT_PATH"
-
 fi
 
 if $FORCE_GENERATE; then

commands/process.sh

@@ -54,7 +54,7 @@ fi
 while [[ "$#" -gt 0 ]]; do
     case $1 in
     -h | --help)
-        printf "${CMD_COL}process${RESET} [${FLG_COL}options${RESET}] ${ARG_COL}<path>${RESET}"
+        printf "${CMD_COL}process${RESET} ${ARG_COL}<path>${RESET} [${FLG_COL}options${RESET}]"
         printf "\t"
         printf "Preprocess dockerfile template from the blueprint\n"
 

commands/pull.sh

@@ -17,6 +17,8 @@
 # Function mode allows to use this command in conjunction
 # with others (i.e. create).
 
+debug_switch_context "PULL"
+
 #
 # Read arguments
 #
@@ -30,8 +32,9 @@ MODE_GET_QUALIFIED=false
 while [[ "$#" -gt 0 ]]; do
     case $1 in
     -h | --help)
-        printf "${CMD_COL}pull${RESET} ${ARG_COL}<blueprint>${RESET} [${FLG_COL}options${RESET}]"
-        printf "\tDownload the latest version of blueprint\n"
+        if [[ "$WITH_USAGE" -eq 1 ]]; then printf "Usage:\n"; fi
+        printf "${CMD_COL}pull${RESET} [${ARG_COL}<blueprint>${RESET}] [${FLG_COL}options${RESET}]"
+        printf "\tDownload the latest version of a blueprint\n"
 
         printf "  ${FLG_COL}--clean${RESET}"
         printf "\t\t\tRemove already existing copy of a blueprint and install fresh download\n"
@@ -49,21 +52,34 @@ while [[ "$#" -gt 0 ]]; do
         MODE_GET_QUALIFIED=true
         ;;
     *)
-        if [[ -z "$1" ]]; then
-            printf "Usage: "
-            bash $ENTRYPOINT pull --help
-            exit 1
-        fi
-
         if [[ -z $BLUEPRINT ]]; then
-            BLUEPRINT=$1
+            BLUEPRINT="$1"
         fi
         ;;
     esac
 
     shift
 done
 
+if [[ -z "$BLUEPRINT" ]]; then
+    ! $AS_FUNCTION && debug_print "No blueprint name provided - trying to resolve from $PROJECT_BLUEPRINT_FILE..."
+
+    # Try to read blueprint name from docker-blueprint.yml
+    if [[ -f "$PROJECT_BLUEPRINT_FILE" ]]; then
+        yq_read_value BLUEPRINT 'from'
+        if [[ -z "$BLUEPRINT" ]]; then
+            ! $AS_FUNCTION && printf "${RED}ERROR${RESET}: Unable to resolve blueprint from project blueprint file.\n\n"
+            WITH_USAGE=1 bash $ENTRYPOINT pull --help
+            exit 1
+        else
+            ! $AS_FUNCTION && debug_print "Found blueprint '$BLUEPRINT' in project blueprint file"
+        fi
+    else
+        bash $ENTRYPOINT pull --help
+        exit 1
+    fi
+fi
+
 #
 # Parse blueprint name and branch
 #
@@ -174,7 +190,14 @@ else
     else
         PREVIOUS_DIR="$PWD"
         cd "$BLUEPRINT_DIR"
-        git fetch >/dev/null
+        git checkout master &>/dev/null
+        git pull &>/dev/null
+        if [[ $? -gt 0 ]]; then
+            cd "$PREVIOUS_DIR"
+            printf "${RED}ERROR${RESET}: Blueprint directory has local changes\n"
+            printf "You can clear local changes with 'docker-blueprint pull --clean'\n"
+            exit 1
+        fi
         cd "$PREVIOUS_DIR"
     fi
 fi
@@ -222,6 +245,21 @@ if ! $MODE_DRY_RUN; then
         fi
     fi
 
+    yq_read_value CHECKPOINT 'version'
+
+    # Set the blueprint repository to the version specified.
+    # This allows to always safely reproduce previous versions of the blueprint.
+    if [[ -n "$CHECKPOINT" ]]; then
+        if ! $AS_FUNCTION; then
+            printf "${BLUE}INFO${RESET}: Version lock applied: ${CYAN}$CHECKPOINT${RESET}\n"
+            git checkout $CHECKPOINT 2>/dev/null
+        else
+            git checkout $CHECKPOINT &>/dev/null
+        fi
+    else
+        ! $AS_FUNCTION && printf "${BLUE}INFO${RESET}: No version lock found - using latest version.\n"
+    fi
+
     cd $PREVIOUS_DIR
 
 fi

commands/run.sh

@@ -140,6 +140,8 @@ elif [[ -n "$PROJECT_CONTEXT" ]]; then
     debug_print "Using DEFAULT context: $PROJECT_CONTEXT"
 fi
 
+debug_print "Program to run:\n%s\n" "$PROGRAM"
+
 # Escape backslashes first
 PROGRAM="$(echo "$PROGRAM" | sed -E 's/\\/\\\\/g')"
 # Escape variable sign ($) to execute it inside runtime
@@ -149,10 +151,9 @@ PROGRAM="$(echo "$PROGRAM" | sed -E 's/"/\\"/g')"
 
 command="env ${ENV_PREFIX[*]} $RUNTIME \"$PROGRAM\""
 
-debug_print "Program to run:\n$PROGRAM"
 debug_print "Running..."
 
-bash $ENTRYPOINT ${ENTRYPOINT_ARGS[*]} -- $SERVICE $COMMAND_VERB "$command"
+bash $ENTRYPOINT ${ENTRYPOINT_ARGS[*]} $SERVICE $COMMAND_VERB "$command"
 
 for key in "${ENVIRONMENT_KEYS[@]}"; do
     unset $key

commands/sync.sh

@@ -12,6 +12,7 @@ shift
 
 MODE_NO_CHOWN=false
 MODE_SKIP_USER=false
+MODE_SKIP_ENV=false
 
 while [[ "$#" -gt 0 ]]; do
     case $1 in
@@ -28,11 +29,13 @@ while [[ "$#" -gt 0 ]]; do
         ;;
     --no-chown)
         MODE_NO_CHOWN=true
-
         ;;
     --skip-user)
         MODE_SKIP_USER=true
         ;;
+    --skip-env)
+        MODE_SKIP_ENV=true
+        ;;
     esac
 
     shift
@@ -64,12 +67,23 @@ if ! $MODE_SKIP_USER && [[ -n "$SYNC_USER" ]]; then
     fi
 fi
 
-if [[ -f .env ]]; then
+if ! $MODE_SKIP_ENV && [[ -f .env ]]; then
     debug_print "Found .env file in the project directory"
     debug_print "Looking for docker-compose files..."
 
+    files=(
+        docker-compose.$PROJECT_CONTEXT.y*ml
+        docker-compose.y*ml
+    )
+
     temp_file="$TEMP_DIR/docker-compose.env"
-    for file in docker-compose*; do
+    touch "$temp_file"
+
+    for file in ${files[@]}; do
+        if [[ ! -f "$file" ]]; then
+            continue
+        fi
+
         debug_print "Found file: $file"
 
         if [[ ! -f "$temp_file" ]]; then