diff options
Diffstat (limited to 'build')
| -rwxr-xr-x | build/build_nexus_blob.sh | 15 | ||||
| -rwxr-xr-x | build/create_repo.sh | 6 | ||||
| -rwxr-xr-x | build/docker-entrypoint.sh | 4 |
3 files changed, 13 insertions, 12 deletions
diff --git a/build/build_nexus_blob.sh b/build/build_nexus_blob.sh index 72dda540..688410ef 100755 --- a/build/build_nexus_blob.sh +++ b/build/build_nexus_blob.sh @@ -212,32 +212,33 @@ push_docker () { while [ "${1}" != "" ]; do case ${1} in -d | --docker ) shift - NXS_DOCKER_IMG_LISTS+=("${1}") + NXS_DOCKER_IMG_LISTS+=("$(realpath ${1})") ;; -i | --input-directory ) shift - DATA_DIR="${1}" + DATA_DIR="$(realpath ${1})" ;; -ld | --load-docker-images ) DOCKER_LOAD="true" ;; -n | --npm ) NPM_PUSH="true" COMMANDS+=(expect npm) shift - NXS_NPM_LISTS+=("${1}") + NXS_NPM_LISTS+=("$(realpath ${1})") ;; -o | --output-directory ) shift - NEXUS_DATA_DIR="${1}" + NEXUS_DATA_DIR="$(realpath ${1})" ;; -p | --pypi ) PYPI_PUSH="true" COMMANDS+=(twine) shift - NXS_PYPI_LISTS+=("${1}") + NXS_PYPI_LISTS+=("$(realpath ${1})") ;; -rl | --resource-list-directory ) shift - LISTS_DIR="${1}" + LISTS_DIR="$(realpath ${1})" ;; -h | --help ) usage ;; *) usage + ;; esac shift done @@ -445,4 +446,4 @@ if [ -f ~/.docker/${DOCKER_CONF_BACKUP} ]; then fi echo "Nexus blob is built" -exit 0
\ No newline at end of file +exit 0 diff --git a/build/create_repo.sh b/build/create_repo.sh index b6db6ad2..eaf0ee30 100755 --- a/build/create_repo.sh +++ b/build/create_repo.sh @@ -12,7 +12,7 @@ container_repo_volume="/mnt/repo/" # Docker image name and version docker_image="centos:centos7.6.1810" # Expected directory for RPM packages -expected_dir="resources/pkg/rhel" +expected_dir="resources/pkg/rpm" help () { echo "Script for run docker container with RPM repository" @@ -56,10 +56,10 @@ do shift;shift done -# Check if path contains expected path "resources/pkg/rhel" +# Check if path contains expected path "resources/pkg/rpm" if ! [[ "/$volume_repo_directory/" = *"/$expected_dir/"* ]]; then # Create repo folder if it not exists - volume_repo_directory="$volume_repo_directory"/resources/pkg/rhel + volume_repo_directory="$volume_repo_directory"/resources/pkg/rpm [ ! -d "$volume_repo_directory" ] && mkdir -p $volume_repo_directory fi diff --git a/build/docker-entrypoint.sh b/build/docker-entrypoint.sh index 1b4ec53c..14f6aaa7 100755 --- a/build/docker-entrypoint.sh +++ b/build/docker-entrypoint.sh @@ -14,7 +14,7 @@ help () { echo -e "-l --list: set path where rpm list is stored in container\n" echo "Both paths have to be set with shared volume between" echo "container and host computer. Default path in container is: /tmp/" - echo "Repository will be created at: /<path>/resources/pkg/rhel/" + echo "Repository will be created at: /<path>/resources/pkg/rpm/" echo "RMP list is stored at: ./data_list/" } @@ -52,7 +52,7 @@ do done # Testing if directory parametter was used -# If not variable is sets to default value /tmp/repo/resources/pkg/rhel +# If not variable is sets to default value /tmp/repo/resources/pkg/rpm if test -z "$OFFLINE_REPO_DIR" then OFFLINE_REPO_DIR="/tmp/repo/" |