Merge branch 'master' of P129679/molgenis-ops-docker-helm into master

2018-07-02 11:53:48 +02:00 · 2018-07-02 11:53:48 +02:00 · 714302fde9
commit 714302fde9
parent 4fd527d024 b58575be5d
1 changed files with 15 additions and 14 deletions
--- a/molgenis-jenkins/values.yaml
+++ b/molgenis-jenkins/values.yaml
@ -208,20 +208,21 @@ jenkins:
          Image: "spotify/alpine"
          Command: cat
          TTY: true
-        elasticsearch:
-          Image: "elasticsearch"
-          ImageTag: "5.5.1"
-          Ports:
-            - name: rest
-              containerPort: "9200"
-            - name: api
-              containerPort: "9300"
-        postgres:
-          Image: "postgres"
-          ImageTag: "9.6-alpine"
-          Ports:
-            - name: postgres
-              containerPort: "5432"
+# Hard to get these right memorywise!
+#        elasticsearch:
+#          Image: "elasticsearch"
+#          ImageTag: "5.5.1"
+#          Ports:
+#            - name: rest
+#              containerPort: "9200"
+#            - name: api
+#              containerPort: "9300"
+#        postgres:
+#          Image: "postgres"
+#          ImageTag: "9.6-alpine"
+#          Ports:
+#            - name: postgres
+#              containerPort: "5432"
      EnvVars:
        - type: Secret
          key: PGP_PASSPHRASE