Merge branch 'master' of https://gitlab.ics.muni.cz/europdx/k8s/cbio-on-demand/api

.gitlab-ci.yml

@@ -33,6 +33,22 @@ stages:
     - docker build --pull -t "${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}" ./cbioondemandK8S
     - docker push "$CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}"
 
+.docker-build-dry:
+  script: &docker-build-dry
+    - docker build --pull ./cbioondemandK8S
+    
+#ALL
+API Pipeline for MR:
+  stage: build
+  <<: *docker-login
+  image: docker:latest
+  script:
+    *docker-build-dry
+  except:
+    - master
+    - dev
+    - beta
+
 #PRODUCTION
 API docker image build:
   <<: *docker-build

cbioondemandK8S/src/main/resources/cbio-replicaset.yml

@@ -80,3 +80,7 @@ spec:
             postStart:
               exec:
                 command: ["python3", "/etc/data-loading/cbio_client.py"]
+          resources:
+            requests:
+              memory: "1400Mi"
+              cpu: "1000m"
\ No newline at end of file

cbioondemandK8S/src/main/resources/cbiodb-replicaset.yml

@@ -78,6 +78,10 @@ spec:
           envFrom:
             - secretRef:
                 name: mysql-env
+          resources:
+            requests:
+              memory: "600Mi"
+              cpu: "50m"
       # we use 1 config for all on-demand databeses
       volumes:
         - name: config