summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page
diff options
context:
space:
mode:
authorManuel Bentele2021-05-19 11:46:36 +0200
committerManuel Bentele2021-05-19 11:46:36 +0200
commitaad75f084c9635878a11e701163ad66e034023ba (patch)
treee18aef591ccd4616687ed53e0b407d58014d9785 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page
parent[client,server] Rename 'vm.disk' package to 'virtualization.disk' (diff)
parent[client] Allow user to set a container type for container images (diff)
downloadtutor-module-aad75f084c9635878a11e701163ad66e034023ba.tar.gz
tutor-module-aad75f084c9635878a11e701163ad66e034023ba.tar.xz
tutor-module-aad75f084c9635878a11e701163ad66e034023ba.zip
Merge branch 'feature/docker'
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
index c2db8554..466b26a0 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
@@ -233,6 +233,12 @@ public class ContainerUploadPage extends ContainerUploadPageLayout {
ContainerBuildContextMethod method = getBuildContextMethod();
switch (method) {
+ case IMAGE_REPO:
+ if (txtImageRepo.getText() == null || txtImageRepo.getText().isEmpty()) {
+ setWarningMessage(I18n.PAGE.getString("ContainerUploadPage.Warning.NoImageRepo"));
+ return false;
+ }
+ break;
case FILE:
if (txtImageFile.getText() == null || txtImageFile.getText().isEmpty()) {
setWarningMessage(I18n.PAGE.getString("ContainerUploadPage.Warning.NoReceipt"));
@@ -271,6 +277,9 @@ public class ContainerUploadPage extends ContainerUploadPageLayout {
case FILE:
containerDefinition.setContainerRecipe(state.descriptionFile);
break;
+ case IMAGE_REPO:
+ containerMeta.setImageRepo(txtImageRepo.getText());
+ state.descriptionFile = getDummyFile();
case GIT_REPOSITORY:
containerMeta.setBuildContextUrl(txtGitRepo.getText());
state.descriptionFile = getDummyFile();