From 581cdf6f84e80ac83ecc016821cc873f0dc952b7 Mon Sep 17 00:00:00 2001 From: Fabien Castan Date: Wed, 1 Feb 2023 12:59:19 +0000 Subject: [PATCH] [docker] rename var --- docker/Dockerfile_centos_deps | 2 +- docker/Dockerfile_ubuntu_deps | 2 +- docker/qt-installer-noninteractive.qs | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile_centos_deps b/docker/Dockerfile_centos_deps index be0ec7a8..a37b27da 100644 --- a/docker/Dockerfile_centos_deps +++ b/docker/Dockerfile_centos_deps @@ -12,7 +12,7 @@ ENV MESHROOM_DEV=/opt/Meshroom \ MESHROOM_BUNDLE=/opt/Meshroom_bundle \ QT_DIR=/opt/Qt5.14.1/5.14.1/gcc_64 \ QT_CI_LOGIN=alicevisionjunk@gmail.com \ - QT_CI_PASSWORD=azerty1. + QT_CI_P=azerty1. WORKDIR ${MESHROOM_BUNDLE} RUN mv "${AV_BUNDLE}" "${MESHROOM_BUNDLE}/aliceVision" && \ diff --git a/docker/Dockerfile_ubuntu_deps b/docker/Dockerfile_ubuntu_deps index 3d4402c4..b5e11ba1 100644 --- a/docker/Dockerfile_ubuntu_deps +++ b/docker/Dockerfile_ubuntu_deps @@ -11,7 +11,7 @@ ENV MESHROOM_DEV=/opt/Meshroom \ MESHROOM_BUILD=/tmp/Meshroom_build \ QT_DIR=/opt/Qt5.14.1/5.14.1/gcc_64 \ QT_CI_LOGIN=alicevisionjunk@gmail.com \ - QT_CI_PASSWORD=azerty1. + QT_CI_P=azerty1. # Workaround for qmlAlembic/qtAliceVision builds: fuse lib/lib64 folders #RUN ln -s ${AV_INSTALL}/lib ${AV_INSTALL}/lib64 diff --git a/docker/qt-installer-noninteractive.qs b/docker/qt-installer-noninteractive.qs index 504aaad9..ae9bed55 100644 --- a/docker/qt-installer-noninteractive.qs +++ b/docker/qt-installer-noninteractive.qs @@ -13,14 +13,14 @@ Controller.prototype.WelcomePageCallback = function() { Controller.prototype.CredentialsPageCallback = function() { console.log("Credentials Page"); var login = installer.environmentVariable("QT_CI_LOGIN"); - var password = installer.environmentVariable("QT_CI_PASSWORD"); - if( login === "" || password === "" ) { + var p = installer.environmentVariable("QT_CI_P"); + if( login === "" || p === "" ) { console.log("No credentials provided - could stuck here forever"); gui.clickButton(buttons.CommitButton); } var widget = gui.currentPageWidget(); widget.loginWidget.EmailLineEdit.setText(login); - widget.loginWidget.PasswordLineEdit.setText(password); + widget.loginWidget.PasswordLineEdit.setText(p); gui.clickButton(buttons.CommitButton); } Controller.prototype.ComponentSelectionPageCallback = function() {