Allow setting custom Helm binary path

[oom/offline-installer.git] / build / create_repo.sh

diff --git a/build/create_repo.sh b/build/create_repo.sh
index ea2b896..f2bde32 100755 (executable)
--- a/build/create_repo.sh
+++ b/build/create_repo.sh
@@ -18,6 +18,9 @@ container_repo_volume="/mnt/repo/"
 # Additional packages lists files path within container
 container_list_volume="/mnt/additional-lists/"
 
+# Use cache by default
+drop_cache=false
+
 # Show script usage
 help () {
 cat <<EOF
@@ -33,6 +36,8 @@ usage: create_repo.sh [OPTION]...
                                    Set it only when you want to use different script/datalists
   -t | --target-platform           target repository platform type (ubuntu/rhel/centos)
   -a | --additional-list           additional packages list; can be used multiple times for more additional lists
+  -n | --container-name-suffix     add custom suffix to docker container name
+  -r | --drop-cache                remove cached packages (use package cache by default)
   -h | --help                      show this help
 
 If build folder from offline repository is not specified current one will be used by default.
@@ -42,19 +47,19 @@ EOF
 # Get distribution type
 # Set Docker image name and version based on type of linux distribution
 # Set expected directory for RPM/DEB packages
-set_enviroment () {
+set_environment () {
     case "$1" in
     ubuntu)
         distro_type="ubuntu"
         docker_image="ubuntu:18.04"
         expected_dir="resources/pkg/deb"
-        container_name=$1"_repo"
+        container_name="${1}_repo${container_name_suffix}"
     ;;
     centos|rhel)
         distro_type="rhel"
         docker_image="centos:centos7.6.1810"
         expected_dir="resources/pkg/rpm"
-        container_name=$1"_repo"
+        container_name="${1}_repo${container_name_suffix}"
     ;;
     *)
         echo "Unknown type of linux distribution."
@@ -64,7 +69,6 @@ set_enviroment () {
 }
 
 # Getting input parametters
-POSITIONAL=()
 if [[ $# -eq 0 ]] ; then
     help # show help
     exit 0
@@ -82,20 +86,33 @@ do
             # Directory parameter
             # Set path to offline-installer build directory
             volume_offline_directory="$2"
+            shift
             ;;
         -d|--destination-repository)
             # Repository directory parameter
             # Set destination path for created repository
             volume_repo_directory="$2"
+            shift
             ;;
         -t|--target-platform)
             # Repository type (rpm/deb)
             # Set target platform for repository
             target_input="$2"
+            shift
             ;;
         -a|--additional-list)
             # Array of additional packages lists
             additional_lists+=("$2")
+            shift
+            ;;
+        -n|--container-name-suffix)
+            # Set custom container name suffix
+            container_name_suffix="_${2}"
+            shift
+            ;;
+        -r|--drop-cache)
+            # Set flag to clean cache
+            drop_cache=true
             ;;
         *)
             # unknown option
@@ -103,16 +120,16 @@ do
             exit 1
             ;;
     esac
-    shift;shift
+    shift
 done
 
 # Check if user specified repository type
 # This setting has higher priority than distribution type
 if ! test -z "$target_input"
 then
-    set_enviroment "$target_input"
+    set_environment "$target_input"
 else
-    set_enviroment "$distro_type"
+    set_environment "$distro_type"
 fi
 
 # Check if path contains expected components:
@@ -131,8 +148,9 @@ if ! [[ "/$volume_repo_directory/" = *"/$expected_dir/"* ]]; then
     [ ! -d "$volume_repo_directory" ] && mkdir -p $volume_repo_directory
 fi
 
-#Check if container "centos-repo" is running
-if [ ! "$(docker ps -q -f name=$container_name)" ]; then
+# Check if container is already running
+if [ ! $(docker ps -q -f name="^${container_name}$") ];
+then
     # run repo container
     # name of container $container_name
     # docker entrypoint script from mounted volume
@@ -143,6 +161,10 @@ if [ ! "$(docker ps -q -f name=$container_name)" ]; then
     param_array+=(--directory ${container_repo_volume})
     param_array+=(--list ${container_offline_volume}data_lists/)
     param_array+=(--packages-lists-path ${container_list_volume})
+    if ${drop_cache};
+    then
+        param_array+=(--drop-cache)
+    fi
     [[ ! ${#additional_lists[@]} -eq 0 ]] && \
         for array_list in "${additional_lists[@]}";
         do
@@ -150,14 +172,12 @@ if [ ! "$(docker ps -q -f name=$container_name)" ]; then
             mounted_lists+=(-v ${array_list}:${container_list_volume}${array_list##*/})
         done
 
-    docker run -d \
-               --name $container_name \
+        docker run --name $container_name \
                -v ${volume_offline_directory}:${container_offline_volume} \
                -v ${volume_repo_directory}:${container_repo_volume} \
                "${mounted_lists[@]}" \
                --rm \
                --entrypoint="${container_offline_volume}docker-entrypoint.sh" \
-                    -it ${docker_image} \
+                    ${docker_image} \
                     "${param_array[@]}"
-    docker logs $(docker ps --filter "name=${container_name}" --format '{{.ID}}' -a) -f
 fi