improving external lib dependencies

Author: darkmattercoder

.travis.yml

@@ -53,14 +53,13 @@ script:
   - docker pull darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || true
   - travis_wait 180 docker build --pull --cache-from darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH --build-arg QT_VERSION_MAJOR=$QT_VERSION_MAJOR --build-arg QT_VERSION_MINOR=$QT_VERSION_MINOR --build-arg QT_VERSION_PATCH=$QT_VERSION_PATCH --build-arg QT_DOWNLOAD_BRANCH=$QT_DOWNLOAD_BRANCH --build-arg QT_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=$CI_BUILD --build-arg CORE_COUNT=$CORE_COUNT --target=base -t darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . || travis_terminate 1;
   - travis_wait 180 docker build --pull --cache-from darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH --build-arg QT_VERSION_MAJOR=$QT_VERSION_MAJOR --build-arg QT_VERSION_MINOR=$QT_VERSION_MINOR --build-arg QT_VERSION_PATCH=$QT_VERSION_PATCH --build-arg QT_DOWNLOAD_BRANCH=$QT_DOWNLOAD_BRANCH --build-arg QT_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=$CI_BUILD --build-arg CORE_COUNT=$CORE_COUNT --target=builder -t darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . || travis_terminate 1;
-  - travis_wait 180 docker build --pull --cache-from darkmattercoder/qt-build:qt-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH --build-arg QT_VERSION_MAJOR=$QT_VERSION_MAJOR --build-arg QT_VERSION_MINOR=$QT_VERSION_MINOR --build-arg QT_VERSION_PATCH=$QT_VERSION_PATCH --build-arg QT_DOWNLOAD_BRANCH=$QT_DOWNLOAD_BRANCH --build-arg QT_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=$CI_BUILD --build-arg CORE_COUNT=$CORE_COUNT --target=qt -t darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . || travis_terminate 1;
+  - travis_wait 180 docker build --pull --cache-from darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH --build-arg QT_VERSION_MAJOR=$QT_VERSION_MAJOR --build-arg QT_VERSION_MINOR=$QT_VERSION_MINOR --build-arg QT_VERSION_PATCH=$QT_VERSION_PATCH --build-arg QT_DOWNLOAD_BRANCH=$QT_DOWNLOAD_BRANCH --build-arg QT_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=$CI_BUILD --build-arg CORE_COUNT=$CORE_COUNT --target=qt -t darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . || travis_terminate 1;
   - tests/generate_tests.py || travis_terminate 1;
   - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH build || travis_terminate 1;
   - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH /var/build/run-tests.sh /var/build/build || travis_terminate 1;
   - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi'
   - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi'
   - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi'
-  - python ci/tag_image.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1;
   - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then python ci/push_images.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH; fi'
 jobs:
   include:

Dockerfile

@@ -120,7 +120,15 @@ ENV ENTRYPOINT_DIR=/usr/local/bin
 ENV APP_BUILDDIR=/var/build
 
 COPY --from=builder ${QT_PREFIX} ${QT_PREFIX}
-COPY --from=builder /opt/extra-dependencies/ /
+
+# the next copy statement failed often. My only guess is, that the extra dependencies are not existent and somehow that
+# triggers a failure here.... A workaround for similar issues is to put an empty run statement in between: https://github.com/moby/moby/issues/37965
+RUN true
+COPY --from=builder /opt/extra-dependencies /opt/extra-dependencies
+
+#for modifications during configuration
+ENV LD_LIBRARY_PATH=/opt/extra-dependencies/lib:${LD_LIBRARY_PATH}
+
 # the next copy statement failed often. My only guess is, that the extra dependencies are not existent and somehow that
 # triggers a failure here.... A workaround for similar issues is to put an empty run statement in between: https://github.com/moby/moby/issues/37965
 RUN true

build-dockerfile-local.sh

@@ -1,14 +1,18 @@
 #!/bin/bash
 # Call this script like so:
-#./build-dockerfile-local.sh 5 6 0 everywhere-opensource 2 8
+#./build-dockerfile-local.sh 5 6 0 official_releases everywhere-opensource 2 8
+set -e
 QT_VERSION_MAJOR=$1
 QT_VERSION_MINOR=$2
 QT_VERSION_PATCH=$3
-QT_TARBALL_NAMING_SCHEME=$4
-CI_BUILD=$5
-CORE_COUNT=$6
-PROXY=$7
+QT_DOWNLOAD_BRANCH=$4
+QT_TARBALL_NAMING_SCHEME=$5
+CI_BUILD=$6
+CORE_COUNT=$7
+PROXY=$8
+# base
+docker build --pull --cache-from darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH --build-arg QT_VERSION_MAJOR=$QT_VERSION_MAJOR --build-arg QT_VERSION_MINOR=$QT_VERSION_MINOR --build-arg QT_VERSION_PATCH=$QT_VERSION_PATCH --build-arg QT_DOWNLOAD_BRANCH=$QT_DOWNLOAD_BRANCH --build-arg QT_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=$CI_BUILD --build-arg CORE_COUNT=$CORE_COUNT --build-arg PROXY=$PROXY --target=base -t darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH .
 # builder
-docker build --pull --build-arg QT_VERSION_MAJOR=$QT_VERSION_MAJOR --build-arg QT_VERSION_MINOR=$QT_VERSION_MINOR --build-arg QT_VERSION_PATCH=$QT_VERSION_PATCH --build-arg QT_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=$CI_BUILD --build-arg CORE_COUNT=$CORE_COUNT --build-arg PROXY=$PROXY --target=builder -t darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH .
+docker build --pull --cache-from darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH --build-arg QT_VERSION_MAJOR=$QT_VERSION_MAJOR --build-arg QT_VERSION_MINOR=$QT_VERSION_MINOR --build-arg QT_VERSION_PATCH=$QT_VERSION_PATCH --build-arg QT_DOWNLOAD_BRANCH=$QT_DOWNLOAD_BRANCH --build-arg QT_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=$CI_BUILD --build-arg CORE_COUNT=$CORE_COUNT --build-arg PROXY=$PROXY --target=builder -t darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH .
 # qt
-docker build --pull --cache-from darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH --build-arg QT_VERSION_MAJOR=$QT_VERSION_MAJOR --build-arg QT_VERSION_MINOR=$QT_VERSION_MINOR --build-arg QT_VERSION_PATCH=$QT_VERSION_PATCH --build-arg QT_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=$CI_BUILD --build-arg CORE_COUNT=$CORE_COUNT --target=qt -t darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH .
+docker build --pull --cache-from darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH --build-arg QT_VERSION_MAJOR=$QT_VERSION_MAJOR --build-arg QT_VERSION_MINOR=$QT_VERSION_MINOR --build-arg QT_VERSION_PATCH=$QT_VERSION_PATCH --build-arg QT_DOWNLOAD_BRANCH=$QT_DOWNLOAD_BRANCH --build-arg QT_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=$CI_BUILD --build-arg CORE_COUNT=$CORE_COUNT --target=qt -t darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH .

buildconfig/configure-5.6.0.sh

@@ -14,5 +14,6 @@ make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
-mkdir /opt/extra-dependencies/opt
-cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
+mkdir -p /opt/extra-dependencies/lib
+cp -r /opt/openssl_build_stable /opt/extra-dependencies
+ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib

buildconfig/configure-5.6.1-1.sh

@@ -16,5 +16,6 @@ make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../../qt-everywhere-opensource-src-5.6.1/configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
-mkdir /opt/extra-dependencies/opt
-cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
+mkdir -p /opt/extra-dependencies/lib
+cp -r /opt/openssl_build_stable /opt/extra-dependencies
+ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib

buildconfig/configure-5.6.2.sh

@@ -14,5 +14,6 @@ make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
-mkdir /opt/extra-dependencies/opt
-cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
+mkdir -p /opt/extra-dependencies/lib
+cp -r /opt/openssl_build_stable /opt/extra-dependencies
+ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib

buildconfig/configure-5.6.3.sh

@@ -14,5 +14,6 @@ make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
-mkdir /opt/extra-dependencies/opt
-cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
+mkdir -p /opt/extra-dependencies/lib
+cp -r /opt/openssl_build_stable /opt/extra-dependencies
+ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib

buildconfig/configure-5.9.0.sh

@@ -14,5 +14,6 @@ make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
-mkdir /opt/extra-dependencies/opt
-cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
+mkdir -p /opt/extra-dependencies/lib
+cp -r /opt/openssl_build_stable /opt/extra-dependencies
+ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib

buildconfig/configure-5.9.1.sh

@@ -14,5 +14,6 @@ make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
-mkdir /opt/extra-dependencies/opt
-cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
+mkdir -p /opt/extra-dependencies/lib
+cp -r /opt/openssl_build_stable /opt/extra-dependencies
+ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib

buildconfig/configure-5.9.2.sh

@@ -14,5 +14,6 @@ make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
-mkdir /opt/extra-dependencies/opt
-cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
+mkdir -p /opt/extra-dependencies/lib
+cp -r /opt/openssl_build_stable /opt/extra-dependencies
+ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib