3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-05-19 20:16:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1887 from alicevision/docker/renameVar

Browse source 
[docker] rename var
This commit is contained in:
Fabien Castan 2023-02-01 13:39:19 +00:00 • committed by GitHub
commit d21b70f45d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docker/Dockerfile_centos_deps
View file

@ -12,7 +12,7 @@ ENV MESHROOM_DEV=/opt/Meshroom \
MESHROOM_BUNDLE=/opt/Meshroom_bundle \ MESHROOM_BUNDLE=/opt/Meshroom_bundle \
QT_DIR=/opt/Qt5.14.1/5.14.1/gcc_64 \ QT_DIR=/opt/Qt5.14.1/5.14.1/gcc_64 \
QT_CI_LOGIN=alicevisionjunk@gmail.com \ QT_CI_LOGIN=alicevisionjunk@gmail.com \
QT_CI_PASSWORD=azerty1. QT_CI_P=azerty1.
WORKDIR ${MESHROOM_BUNDLE} WORKDIR ${MESHROOM_BUNDLE}
RUN mv "${AV_BUNDLE}" "${MESHROOM_BUNDLE}/aliceVision" && \ RUN mv "${AV_BUNDLE}" "${MESHROOM_BUNDLE}/aliceVision" && \

2
docker/Dockerfile_ubuntu_deps
View file

@ -11,7 +11,7 @@ ENV MESHROOM_DEV=/opt/Meshroom \
MESHROOM_BUILD=/tmp/Meshroom_build \ MESHROOM_BUILD=/tmp/Meshroom_build \
QT_DIR=/opt/Qt5.14.1/5.14.1/gcc_64 \ QT_DIR=/opt/Qt5.14.1/5.14.1/gcc_64 \
QT_CI_LOGIN=alicevisionjunk@gmail.com \ QT_CI_LOGIN=alicevisionjunk@gmail.com \
QT_CI_PASSWORD=azerty1. QT_CI_P=azerty1.
# Workaround for qmlAlembic/qtAliceVision builds: fuse lib/lib64 folders # Workaround for qmlAlembic/qtAliceVision builds: fuse lib/lib64 folders
#RUN ln -s ${AV_INSTALL}/lib ${AV_INSTALL}/lib64 #RUN ln -s ${AV_INSTALL}/lib ${AV_INSTALL}/lib64

6
docker/qt-installer-noninteractive.qs
View file

@ -13,14 +13,14 @@ Controller.prototype.WelcomePageCallback = function() {
Controller.prototype.CredentialsPageCallback = function() { Controller.prototype.CredentialsPageCallback = function() {
console.log("Credentials Page"); console.log("Credentials Page");
var login = installer.environmentVariable("QT_CI_LOGIN"); var login = installer.environmentVariable("QT_CI_LOGIN");
var password = installer.environmentVariable("QT_CI_PASSWORD"); var p = installer.environmentVariable("QT_CI_P");
if( login === "" || password === "" ) { if( login === "" || p === "" ) {
console.log("No credentials provided - could stuck here forever"); console.log("No credentials provided - could stuck here forever");
gui.clickButton(buttons.CommitButton); gui.clickButton(buttons.CommitButton);
} }
var widget = gui.currentPageWidget(); var widget = gui.currentPageWidget();
widget.loginWidget.EmailLineEdit.setText(login); widget.loginWidget.EmailLineEdit.setText(login);
widget.loginWidget.PasswordLineEdit.setText(password); widget.loginWidget.PasswordLineEdit.setText(p);
gui.clickButton(buttons.CommitButton); gui.clickButton(buttons.CommitButton);
} }
Controller.prototype.ComponentSelectionPageCallback = function() { Controller.prototype.ComponentSelectionPageCallback = function() {