Merge pull request #1257 from apache/DATALAB-408
[DATALAB-408]: added repository port as a separate parameter, added possibility to enable or disable jars/docker images download from repository
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/NotebookTemplate.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/NotebookTemplate.java
index 294621e..10eb99e 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/NotebookTemplate.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/NotebookTemplate.java
@@ -33,7 +33,10 @@
TENSOR_RSTUDIO("RStudio with TensorFlow 2.3.2"),
RSTUDIO("RStudio 1.4.1103"),
TENSOR_GCP("Jupyter with TensorFlow 2.1.0"),
- DEEP_LEARNING_GCP("Deeplearning notebook");
+ DEEP_LEARNING_GCP("Deeplearning notebook"),
+ DEEP_LEARNING_AWS("Deep Learning AMI Version 42.1"),
+ DEEP_LEARNING_AZURE("Data Science Virtual Machine - Ubuntu 18.04");
+
private final String name;
}
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java
index 9ee95f2..cfc5e6c 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java
@@ -163,15 +163,13 @@
if (isTemplateGroup(templateName, Stream.of(JUPYTER, ZEPPELIN))) {
groups.addAll(Arrays.asList(GROUP_R_PKG, GROUP_JAVA));
}
- if (isTemplateGroup(templateName, Stream.of(DEEP_LEARNING, TENSOR))) {
+ if (isTemplateGroup(templateName, Stream.of(DEEP_LEARNING, TENSOR, TENSOR_GCP,
+ DEEP_LEARNING_GCP, DEEP_LEARNING_AWS, DEEP_LEARNING_AZURE))) {
groups.add(GROUP_JAVA);
}
if (isTemplateGroup(templateName, Stream.of(RSTUDIO, TENSOR_RSTUDIO))) {
groups.add(GROUP_R_PKG);
}
- if (isTemplateGroup(templateName, Stream.of(DEEP_LEARNING_GCP, TENSOR_GCP))) {
- groups.add(GROUP_JAVA);
- }
return groups
.stream()
