From 989a7ddd6a180d9c895cfe31ea296d1b17766f33 Mon Sep 17 00:00:00 2001 From: Phil Elson Date: Fri, 26 Mar 2021 08:47:07 +0100 Subject: [PATCH] Simplify the build since we only need one application image for both the caclulator and the expert app. --- .dockerignore | 4 +++ .gitignore | 6 ++++ .gitlab-ci.yml | 2 -- README.md | 3 +- app-config/docker-compose.yml | 5 ++- app-config/openshift/application.yaml | 44 +++++---------------------- app.sh | 1 - 7 files changed, 23 insertions(+), 42 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..7863674d --- /dev/null +++ b/.dockerignore @@ -0,0 +1,4 @@ +venv +env* +prototypes +support diff --git a/.gitignore b/.gitignore index dbf9ac2d..38eee2e6 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,9 @@ __pycache__ *.swp .idea .vscode + + +env* +venv +support + diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c35bba5..2103491b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,6 @@ trigger_build_on_openshift: rules: - if: '$OPENSHIFT_BUILD_WEBHOOK_SECRET' script: - - curl -X POST -k https://openshift.cern.ch:443/apis/build.openshift.io/v1/namespaces/cara/buildconfigs/cara-app/webhooks/${OPENSHIFT_BUILD_WEBHOOK_SECRET}/generic - curl -X POST -k https://openshift.cern.ch:443/apis/build.openshift.io/v1/namespaces/cara/buildconfigs/cara-router/webhooks/${OPENSHIFT_BUILD_WEBHOOK_SECRET}/generic - curl -X POST -k https://openshift.cern.ch:443/apis/build.openshift.io/v1/namespaces/cara/buildconfigs/cara-webservice/webhooks/${OPENSHIFT_BUILD_WEBHOOK_SECRET}/generic - curl -X POST -k https://openshift.cern.ch:443/apis/build.openshift.io/v1/namespaces/cara/buildconfigs/auth-service/webhooks/${OPENSHIFT_BUILD_WEBHOOK_SECRET}/generic @@ -35,7 +34,6 @@ deploy_to_test: rules: - if: '$CI_COMMIT_BRANCH == "live/test-cara" && $OPENSHIFT_TEST_BUILD_WEBHOOK_SECRET' script: - - curl -X POST -k https://openshift-dev.cern.ch:443/apis/build.openshift.io/v1/namespaces/test-cara/buildconfigs/cara-app/webhooks/${OPENSHIFT_TEST_BUILD_WEBHOOK_SECRET}/generic - curl -X POST -k https://openshift-dev.cern.ch:443/apis/build.openshift.io/v1/namespaces/test-cara/buildconfigs/cara-router/webhooks/${OPENSHIFT_TEST_BUILD_WEBHOOK_SECRET}/generic - curl -X POST -k https://openshift-dev.cern.ch:443/apis/build.openshift.io/v1/namespaces/test-cara/buildconfigs/cara-webservice/webhooks/${OPENSHIFT_TEST_BUILD_WEBHOOK_SECRET}/generic - curl -X POST -k https://openshift-dev.cern.ch:443/apis/build.openshift.io/v1/namespaces/test-cara/buildconfigs/auth-service/webhooks/${OPENSHIFT_TEST_BUILD_WEBHOOK_SECRET}/generic diff --git a/README.md b/README.md index efb61d31..c7915e86 100644 --- a/README.md +++ b/README.md @@ -62,8 +62,7 @@ pytest ./cara ``` s2i build file://$(pwd) --copy --keep-symlinks --context-dir ./app-config/nginx/ centos/nginx-112-centos7 cara-nginx-app -s2i build file://$(pwd) --copy --keep-symlinks --env APP_NAME=cara-voila --context-dir ./ centos/python-36-centos7 cara-voila-app -s2i build file://$(pwd) --copy --keep-symlinks --env APP_NAME=cara-webservice --context-dir ./ centos/python-36-centos7 cara-webservice +s2i build file://$(pwd) --copy --keep-symlinks --context-dir ./ centos/python-36-centos7 cara-webservice s2i build file://$(pwd) --copy --keep-symlinks --context-dir ./app-config/auth-service centos/python-36-centos7 auth-service cd app-config docker-compose up diff --git a/app-config/docker-compose.yml b/app-config/docker-compose.yml index e3d76f0c..145d1253 100644 --- a/app-config/docker-compose.yml +++ b/app-config/docker-compose.yml @@ -1,12 +1,15 @@ version: "3.8" services: cara-app: - image: cara-voila-app + image: cara-webservice + environment: + - APP_NAME=cara-voila cara-webservice: image: cara-webservice environment: - COOKIE_SECRET + - APP_NAME=cara-webservice auth-service: image: auth-service diff --git a/app-config/openshift/application.yaml b/app-config/openshift/application.yaml index 307a1c56..bf0a2898 100644 --- a/app-config/openshift/application.yaml +++ b/app-config/openshift/application.yaml @@ -75,37 +75,6 @@ secretReference: name: gitlab-cara-webhook-secret type: Generic - - - kind: BuildConfig - apiVersion: v1 - metadata: - name: cara-app - spec: - source: - git: - ref: ${GIT_BRANCH} - uri: ${GIT_REPO} - sourceSecret: - name: sshdeploykey - output: - to: - kind: ImageStreamTag - name: 'cara-app:latest' - strategy: - sourceStrategy: - env: - - name: APP_NAME - value: cara-voila - from: - kind: ImageStreamTag - name: 'python:3.6' - namespace: openshift - type: Source - triggers: - - generic: - secretReference: - name: gitlab-cara-webhook-secret - type: Generic - kind: ImageStream apiVersion: v1 @@ -163,9 +132,6 @@ name: 'cara-webservice:latest' strategy: sourceStrategy: - env: - - name: APP_NAME - value: cara-webservice from: kind: ImageStreamTag name: 'python:3.6' @@ -229,7 +195,10 @@ spec: containers: - name: cara-app - image: '${PROJECT_NAME}/cara-app' + env: + - name: APP_NAME + value: cara-voila + image: '${PROJECT_NAME}/cara-webservice' ports: - containerPort: 8080 protocol: TCP @@ -242,7 +211,7 @@ - cara-app from: kind: ImageStreamTag - name: 'cara-app:latest' + name: 'cara-webservice:latest' namespace: ${PROJECT_NAME} - apiVersion: v1 @@ -290,6 +259,9 @@ spec: containers: - name: cara-webservice + env: + - name: APP_NAME + value: cara-webservice image: '${PROJECT_NAME}/cara-webservice' ports: - containerPort: 8080 diff --git a/app.sh b/app.sh index 000fe79d..d4fdf7c5 100755 --- a/app.sh +++ b/app.sh @@ -1,4 +1,3 @@ -env if [[ "$APP_NAME" == "cara-webservice" ]]; then echo "Starting the cara webservice" python -m cara.apps.calculator