X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fshell%2Fbuild-docker.sh;h=d745af657894e61c851b5fa133330487c60a7f09;hp=014a7f95bd297c7b41852af1ca29a717c79734e8;hb=683452330b0784c355d032aae4454674d7fdc60e;hpb=86ea27387df4e9ae694f6d6544452810faa0261d diff --git a/jjb/shell/build-docker.sh b/jjb/shell/build-docker.sh index 014a7f9..d745af6 100644 --- a/jjb/shell/build-docker.sh +++ b/jjb/shell/build-docker.sh @@ -16,6 +16,7 @@ DOCKER_REPO='nexus3.akraino.org:10003' STAGING_BUILD=${STAGING_BUILD:=''} +AUTOSTAGING=${AUTOSTAGING:=''} set -e -u -x -o pipefail @@ -80,9 +81,11 @@ else postgres_db_schema) CON_NAME='akraino_schema_db' - # This runs on ubuntu, so yum wont work. - sudo apt install -y dos2unix - dos2unix "${WORKSPACE}/version.properties" + # Unfortunatly, there is another apt running in the background at this point, so this apt will always fail. + # E: Could not get lock /var/lib/dpkg/lock - open (11: Resource temporarily unavailable) + # Since it probably is not needed, I am just removing it. + # sudo apt install -y dos2unix + # dos2unix "${WORKSPACE}/version.properties" source "$WORKSPACE/version.properties" if [ -n "$STAGING_BUILD" -a -n "$AUTOSTAGING" ]