Commit cb9de5b7 authored by Ľuboslav Pivarč's avatar Ľuboslav Pivarč
Browse files

Merge branch '456130-master-patch-23416' into 'master'

Set Request = Limits

See merge request !13
parents 8497ad6d 90bef6fe
Pipeline #26987 passed with stages
in 11 minutes and 45 seconds
......@@ -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
......
......@@ -80,3 +80,10 @@ spec:
postStart:
exec:
command: ["python3", "/etc/data-loading/cbio_client.py"]
resources:
limits:
memory: "1400Mi"
cpu: "1000m"
requests:
memory: "1400Mi"
cpu: "1000m"
\ No newline at end of file
......@@ -78,6 +78,13 @@ spec:
envFrom:
- secretRef:
name: mysql-env
resources:
limits:
memory: "600Mi"
cpu: "50m"
requests:
memory: "600Mi"
cpu: "50m"
# we use 1 config for all on-demand databeses
volumes:
- name: config
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment