reorganized ci

.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

docker/pgapp/pgapp-deploy.yaml

+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

docker/pgdata/pgdata-deploy.yaml

+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

manifest.yaml → docker/wpdb/wpdb-deploy.yaml

@@ -30,51 +30,3 @@ spec:
           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