.gitlab-ci.yml

@@ -1,37 +1,3 @@
-include:
-  - template: Security/Container-Scanning.gitlab-ci.yml
-
-##############################################################################
-# Pipeline stages in order of execution                                      #
-##############################################################################
-stages:
-  - build
-  - publish
-  - sca
-
-##############################################################################
-# Pipeline behavior                                                          #
-##############################################################################
-workflow:
-  rules:
-    # Run the pipeline on commits to the default branch
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-      variables:
-        # Set the Docker image tag to `latest`
-        DOCKER_IMAGE: $CI_REGISTRY_IMAGE:latest
-      when: always
-    # Run the pipeline on tag creation
-    - if: $CI_COMMIT_TAG
-      variables:
-        # Set the Docker image tag to the Git tag name
-        DOCKER_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
-      when: always
-    # Don't run the pipeline on all other occasions
-    - when: never
-
-##############################################################################
-# Default values for pipeline jobs                                           #
-##############################################################################
 default:
   image: docker:24.0.6
   services:
@@ -39,46 +5,38 @@ default:
   tags:
     - docker
 
-##############################################################################
-# CI/CD variables for all jobs in the pipeline                               #
-##############################################################################
 variables:
   DOCKER_TLS_CERTDIR: /certs
-  DOCKER_BUILD_PATH: .
-  DOCKERFILE: Dockerfile
 
-##############################################################################
-# Pipeline jobs                                                              #
-##############################################################################
-build:
+build_image:
   stage: build
-  script:
-    - docker build --tag $DOCKER_IMAGE --file $DOCKERFILE $DOCKER_BUILD_PATH
-    - docker save $DOCKER_IMAGE > docker_image.tar
-  artifacts:
-    paths:
-      - docker_image.tar
-
-publish:
-  stage: publish
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      when: on_success
+      variables:
+        IMAGE_TAG: $CI_REGISTRY_IMAGE:latest
+    - if: $CI_COMMIT_TAG
+      when: "on_success"
+      variables:
+        IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+    - when: never
   before_script:
-    - docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
   script:
-    - docker load --input docker_image.tar
-    - docker push $DOCKER_IMAGE
-  after_script:
-    - docker logout $CI_REGISTRY
+    - docker build -t $IMAGE_TAG .
+    - docker push $IMAGE_TAG
+
+include:
+  - template: Security/Container-Scanning.gitlab-ci.yml
 
 container_scanning:
-  stage: sca
   rules:
-    # Run the job on commits to the default branch
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-      when: always
-    # Run the job on tag creation
+      when: on_success
+      variables:
+        CS_IMAGE: $CI_REGISTRY_IMAGE:latest
     - if: $CI_COMMIT_TAG
-      when: always
-    # Don't run the job on all other occasions
+      when: on_success
+      variables:
+        CS_IMAGE: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}
     - when: never
-  variables:
-    CS_IMAGE: $DOCKER_IMAGE

app/daemon/corpus_utils.py

@@ -45,7 +45,7 @@ def _create_build_corpus_service(corpus):
     ''' ## Constraints ## '''
     constraints = ['node.role==worker']
     ''' ## Image ## '''
-    image = f'{current_app.config["NOPAQUE_DOCKER_IMAGE_PREFIX"]}cwb:r1879'
+    image = f'{current_app.config["NOPAQUE_DOCKER_IMAGE_PREFIX"]}cwb:r1853'
     ''' ## Labels ## '''
     labels = {
         'origin': current_app.config['SERVER_NAME'],
@@ -139,7 +139,7 @@ def _create_cqpserver_container(corpus):
     ''' ## Entrypoint ## '''
     entrypoint = ['bash', '-c']
     ''' ## Image ## '''
-    image = f'{current_app.config["NOPAQUE_DOCKER_IMAGE_PREFIX"]}cwb:r1879'
+    image = f'{current_app.config["NOPAQUE_DOCKER_IMAGE_PREFIX"]}cwb:r1853'
     ''' ## Name ## '''
     name = f'cqpserver_{corpus.id}'
     ''' ## Network ## '''

config.py

@@ -115,8 +115,6 @@ class Config:
     NOPAQUE_READCOOP_USERNAME = os.environ.get('NOPAQUE_READCOOP_USERNAME')
     NOPAQUE_READCOOP_PASSWORD = os.environ.get('NOPAQUE_READCOOP_PASSWORD')
 
-    NOPAQUE_VERSION='1.0.0'
-
     @staticmethod
     def init_app(app: Flask):
         # Set up logging according to the corresponding (NOPAQUE_LOG_*)