diff options
author | Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2019-11-15 09:54:23 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-11-15 09:54:23 +0000 |
commit | 271281a0af7e3832810b86dd4b2b3f9c7d382b7b (patch) | |
tree | 5dfdd90a874f71c22ab1fa43bd5bf140c6dfae01 /build | |
parent | 42e75d336da892ede39675e9d55a506a5be4ed6f (diff) | |
parent | 5907acf7093ed3c64b418590287db8446f9bac21 (diff) |
Merge "Chaging name of rhel resource directory to rpm"
Diffstat (limited to 'build')
-rwxr-xr-x | build/create_repo.sh | 6 | ||||
-rwxr-xr-x | build/docker-entrypoint.sh | 4 |
2 files changed, 5 insertions, 5 deletions
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/" |