From 2ef97a62e601eb1dbb843a11986469fbb3a0b37d Mon Sep 17 00:00:00 2001 From: Yori Fournier Date: Tue, 27 Oct 2020 16:09:33 +0100 Subject: [PATCH] reorganized ci --- .gitlab-ci.yml | 34 ++++++++++++-- docker/pgapp/pgapp-deploy.yaml | 23 +++++++++ docker/pgdata/pgdata-deploy.yaml | 23 +++++++++ docker/wpdb/wpdb-deploy.yaml | 32 +++++++++++++ manifest.yaml | 80 -------------------------------- 5 files changed, 107 insertions(+), 85 deletions(-) create mode 100644 docker/pgapp/pgapp-deploy.yaml create mode 100644 docker/pgdata/pgdata-deploy.yaml create mode 100644 docker/wpdb/wpdb-deploy.yaml delete mode 100644 manifest.yaml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index da914d3..796810d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ variables: - oc new-build --strategy=docker --binary --name "build-$APP" --to "image-$APP" --env-file="./docker/$APP/env" - oc start-build build-$APP --from-dir=./docker/$APP --follow -build-pgapp: +pgapp:build: stage: build variables: APP: pgapp @@ -35,7 +35,7 @@ build-pgapp: script: - *build_image -build-pgdata: +pgdata:build: stage: build variables: APP: pgdata @@ -46,7 +46,7 @@ build-pgdata: script: - *build_image -build-wpdb: +wpdb:build: stage: build variables: APP: wpdb @@ -57,10 +57,34 @@ build-wpdb: script: - *build_image -deploy: +pgapp:deploy: stage: deploy + needs: ["pgapp:build"] before_script: - *login_to_okd script: - - oc apply -f manifest.yaml + - oc apply -f docker/pgapp/pgapp-deploy.yaml + +pgdata:deploy: + stage: deploy + needs: ["pgdata:build"] + before_script: + - *login_to_okd + script: + - oc apply -f docker/pgdata/pgdata-deploy.yaml + +wpdb:deploy: + stage: deploy + needs: ["wpdb:build"] + before_script: + - *login_to_okd + script: + - oc apply -f docker/wpdb/wpdb-deploy.yaml + +#deploy: +# stage: deploy +# before_script: +# - *login_to_okd +# script: +# - oc apply -f manifest.yaml # - oc new-app image-wpdb # this is working if one adds securityContext: runAsUser: 1000 in YAML file of deploymentConfig \ No newline at end of file diff --git a/docker/pgapp/pgapp-deploy.yaml b/docker/pgapp/pgapp-deploy.yaml new file mode 100644 index 0000000..b5ad2ab --- /dev/null +++ b/docker/pgapp/pgapp-deploy.yaml @@ -0,0 +1,23 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: deploy-pgapp + labels: + app: pgapp +spec: + replicas: 1 + selector: + matchLabels: + app: pgapp + template: + metadata: + labels: + app: pgapp + spec: + securityContext: + runAsUser: 1000 + containers: + - name: pgapp + image: docker-registry.default.svc:5000/daiquiri-test-instance-498/image-pgapp:latest + ports: + - containerPort: 5282 diff --git a/docker/pgdata/pgdata-deploy.yaml b/docker/pgdata/pgdata-deploy.yaml new file mode 100644 index 0000000..b66f2fa --- /dev/null +++ b/docker/pgdata/pgdata-deploy.yaml @@ -0,0 +1,23 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: deploy-pgdata + labels: + app: pgdata +spec: + replicas: 1 + selector: + matchLabels: + app: pgdata + template: + metadata: + labels: + app: pgdata + spec: + securityContext: + runAsUser: 1000 + containers: + - name: pgdata + image: docker-registry.default.svc:5000/daiquiri-test-instance-498/image-pgdata:latest + ports: + - containerPort: 5281 \ No newline at end of file diff --git a/docker/wpdb/wpdb-deploy.yaml b/docker/wpdb/wpdb-deploy.yaml new file mode 100644 index 0000000..6188588 --- /dev/null +++ b/docker/wpdb/wpdb-deploy.yaml @@ -0,0 +1,32 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: deploy-wpdb + labels: + app: wpdb +spec: + replicas: 1 + selector: + matchLabels: + app: wpdb + template: + metadata: + labels: + app: wpdb + spec: + securityContext: + runAsUser: 1000 + containers: + - name: wpdb + env: + - name: MYSQL_USER + value: wpdb + - name: MYSQL_PASSWORD + value: secret + - name: MYSQL_ROOT_PASSWORD + value: very-secret + - name: MYSQL_DATABASE + value: wpdb + image: docker-registry.default.svc:5000/daiquiri-test-instance-498/image-wpdb:latest + ports: + - containerPort: 5280 diff --git a/manifest.yaml b/manifest.yaml deleted file mode 100644 index 66eacec..0000000 --- a/manifest.yaml +++ /dev/null @@ -1,80 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: deploy-wpdb - labels: - app: wpdb -spec: - replicas: 1 - selector: - matchLabels: - app: wpdb - template: - metadata: - labels: - app: wpdb - spec: - securityContext: - runAsUser: 1000 - containers: - - name: wpdb - env: - - name: MYSQL_USER - value: wpdb - - name: MYSQL_PASSWORD - value: secret - - name: MYSQL_ROOT_PASSWORD - value: very-secret - - name: MYSQL_DATABASE - value: wpdb - image: docker-registry.default.svc:5000/daiquiri-test-instance-498/image-wpdb:latest - ports: - - containerPort: 5280 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: deploy-pgapp - labels: - app: pgapp -spec: - replicas: 1 - selector: - matchLabels: - app: pgapp - template: - metadata: - labels: - app: pgapp - spec: - securityContext: - runAsUser: 1000 - containers: - - name: pgapp - image: docker-registry.default.svc:5000/daiquiri-test-instance-498/image-pgapp:latest - ports: - - containerPort: 5282 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: deploy-pgdata - labels: - app: pgdata -spec: - replicas: 1 - selector: - matchLabels: - app: pgdata - template: - metadata: - labels: - app: pgdata - spec: - securityContext: - runAsUser: 1000 - containers: - - name: pgdata - image: docker-registry.default.svc:5000/daiquiri-test-instance-498/image-pgdata:latest - ports: - - containerPort: 5281 \ No newline at end of file -- GitLab