Merge pull request #141 from xschildw/dev-plfm3921

Dev plfm3921
Sage-Bionetworks · Jun 19, 2016 · 6f93167 · 6f93167
2 parents 43c3a8a + d26bd12
commit 6f93167
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/src/main/java/org/sagebionetworks/stack/Constants.java b/src/main/java/org/sagebionetworks/stack/Constants.java
@@ -100,6 +100,9 @@ public class Constants {
 	public static final String KEY_ORG_SAGEBIONETWORKS_CLOUDMAILIN_PW_PLAINTEXT = "org.sagebionetworks.email.cloudmailin.password.plaintext";
 	public static final String KEY_ORG_SAGEBIONETWORKS_OAUTH2_ORCID_CLIENT_ID="org.sagebionetworks.oauth2.orcid.client.id";
 	public static final String KEY_ORG_SAGEBIONETWORKS_OAUTH2_ORCID_CLIENT_SECRET="org.sagebionetworks.oauth2.orcid.client.secret.plaintext";
+	public static final String KEY_ORG_SAGEBIONETWORKS_DOCKER_AUTHORIZATION_PRIVATE_KEY_PLAINTEXT="org.sagebionetworks.docker.authorization.private.key.plaintext";
+	public static final String KEY_ORG_SAGEBIONETWORKS_DOCKER_AUTHORIZATION_CERTIFICATE="org.sagebionetworks.docker.authorization.certificate";
+
 
 	public static final String KEY_ORG_SAGEBIONETWORKS_PORTAL_ACM_CERT_ARN="org.sagebionetworks.PORTAL.acm.certificate.arn";
 	public static final String KEY_ORG_SAGEBIONETWORKS_REPO_ACM_CERT_ARN="org.sagebionetworks.REPO.acm.certificate.arn";

diff --git a/src/main/resources/stack-config-template.properties b/src/main/resources/stack-config-template.properties
@@ -84,3 +84,7 @@ org.sagebionetworks.notification.email.address=${org.sagebionetworks.notificatio
 #CloudMailIn
 org.sagebionetworks.email.cloudmailin.user = ${org.sagebionetworks.email.cloudmailin.user.encrypted}
 org.sagebionetworks.email.cloudmailin.password = ${org.sagebionetworks.email.cloudmailin.password.encrypted}
+
+#Docker
+org.sagebionetworks.docker.authorization.private.key=${org.sagebionetworks.docker.authorization.private.key.encrypted}
+org.sagebionetworks.docker.authorization.certificate=${org.sagebionetworks.docker.authorization.certificate}
diff --git a/src/test/java/org/sagebionetworks/stack/TestHelper.java b/src/test/java/org/sagebionetworks/stack/TestHelper.java
@@ -86,6 +86,8 @@ public static Properties createDefaultProperties() {
 		defaults.put(KEY_ORG_SAGEBIONETWORKS_CLOUDMAILIN_PW_PLAINTEXT, "cloudmailinpwd");
 		defaults.put(KEY_ORG_SAGEBIONETWORKS_OAUTH2_ORCID_CLIENT_ID, "oauth2orcidid");
 		defaults.put(KEY_ORG_SAGEBIONETWORKS_OAUTH2_ORCID_CLIENT_SECRET, "oauth2orcidsecret");
+		defaults.put(KEY_ORG_SAGEBIONETWORKS_DOCKER_AUTHORIZATION_PRIVATE_KEY_PLAINTEXT, "privateKey");
+		defaults.put(KEY_ORG_SAGEBIONETWORKS_DOCKER_AUTHORIZATION_CERTIFICATE, "certificate");
 
 		return defaults;
 	}