Release 7.0.0

.circleci/config.yml

@@ -3,29 +3,32 @@ jobs:
   build:
     working_directory: ~/phovea
     docker:
-      - image: caleydo/phovea_circleci_python:v2.0
+      - image: circleci/python:3.7-buster-node-browsers # for node version see Dockerfile on https://hub.docker.com/r/circleci/python
     steps:
       - checkout
       - setup_remote_docker
       - restore_cache:
-          key: dependency-cache-{{ checksum "package.json" }}
+          key: dependency2-cache-{{ checksum "package.json" }}
       - run:
           name: install-npm-wee
           command: npm install
+      - run:
+          name: Show installed npm dependencies
+          command: npm list --depth=1 || true
       - save_cache:
-          key: dependency-cache-{{ checksum "package.json" }}
+          key: dependency2-cache-{{ checksum "package.json" }}
           paths:
             - ./node_modules
       - restore_cache:
-          key: awscli-1.11.113
+          key: awscli-1.16.312
       - run:
           name: install-aws-cli
           command: |
             virtualenv ~/venv
             . ~/venv/bin/activate
-            pip install awscli==1.11.113
+            pip install awscli==1.16.312
       - save_cache:
-          key: awscli-1.11.113
+          key: awscli-1.16.312
           paths:
           - ~/venv
       - run:
@@ -51,30 +54,30 @@ jobs:
               awsTag="latest"
               ;;
             *)
-              awsTag="${CIRCLE_BRANCH}${CIRCLE_TAG}"
+              awsTag="${CIRCLE_BRANCH//\//_}${CIRCLE_TAG}" # replace `/` with `_` in branch name
               ;;
             esac
             echo "using tag: --${awsTag}--"
-            node build.js --serial --skipSaveImage --skipTests --noDefaultTags --pushExtra=${awsTag} --pushTo=922145058410.dkr.ecr.eu-central-1.amazonaws.com/caleydo
+            node build.js --injectVersion --skipSaveImage --skipTests --noDefaultTags --pushExtra=${awsTag} --pushTo=922145058410.dkr.ecr.eu-central-1.amazonaws.com/caleydo
       - store_artifacts:
           path: build
-          prefix: build
+          destination: build
       - deploy:
           name: cleanup untagged aws repo
           command: |
             . ~/venv/bin/activate
             export AWS_DEFAULT_REGION=eu-central-1
             baseName=${CIRCLE_PROJECT_REPONAME%_product}
             # list repos filter to just the one of this product and delete untagged ones
-            aws ecr describe-repositories --output text | cut -f5 | grep "caleydo/${baseName}" | while read line; do aws ecr list-images --repository-name $line --filter tagStatus=UNTAGGED --query 'imageIds[*]' --output text | while read imageId; do aws ecr batch-delete-image --output text --repository-name $line --image-ids imageDigest=$imageId; done; done
+            aws ecr describe-repositories --output text | cut -f6 | grep "caleydo/${baseName}" | while read line; do aws ecr list-images --repository-name $line --filter tagStatus=UNTAGGED --query 'imageIds[*]' --output text | while read imageId; do aws ecr batch-delete-image --output text --repository-name $line --image-ids imageDigest=$imageId; done; done
       - deploy:
           name: restart aws #assumes the task definition is called <reponame>-<branch>
           command: |
             . ~/venv/bin/activate
             export AWS_DEFAULT_REGION=eu-central-1
             # cleanup name by removing the _product suffix
             baseName=${CIRCLE_PROJECT_REPONAME%_product}
-            awsFamily="${baseName}-${CIRCLE_BRANCH}"
+            awsFamily="${baseName}-${CIRCLE_BRANCH//\//_}" # replace `/` with `_` in branch name
             echo "awsFamily --${awsFamily}--"
             tasksExists=$(aws --output text ecs list-task-definitions --family-prefix ${awsFamily})
             echo "existsTaskDefinition? --${tasksExists}--"
@@ -91,16 +94,16 @@ jobs:
 
 workflows:
   version: 2
-#  build-nightly:
-#    triggers:
-#      - schedule: # nightly build during weekday
-#          cron: "15 1 * * 1-5"
-#          filters:
-#            branches:
-#              only:
-#                - develop
-#    jobs:
-#      - build
+  # build-nightly:
+  #   triggers:
+  #     - schedule: # nightly build during weekday
+  #         cron: "15 1 * * 1-5"
+  #         filters:
+  #           branches:
+  #             only:
+  #               - develop
+  #   jobs:
+  #     - build
   build-branch:
     jobs:
       - build:
@@ -115,4 +118,3 @@ workflows:
               ignore: /.*/
             tags:
               only: /^v.*/
-

.github/CODEOWNERS

@@ -0,0 +1 @@
+*   @thinkh

.gitignore

@@ -1,11 +1,31 @@
-/.tscache
-/.idea
-/build/
-/dist/
-node_modules/
-/src/**/*.js
-/tests/**/*.js
-*.map
-*.css
-*.log
-/tmp*/
+# ignore all files and plugin repos of the workspace ...
+.*
+*.*
+/*/
+*
+package-lock.json
+
+# ... except all files relevant for the product build
+!/.circleci/
+!/.github
+!templates/
+!templates/web/
+!templates/web/deploy
+!templates/web/deploy/web
+!templates/web/deploy/web/*
+!templates/api/
+!templates/api/deploy
+!templates/api/deploy/api
+!templates/api/deploy/api/*
+!.editorconfig
+!.gitattributes
+!.yo-rc.json
+!ISSUE_TEMPLATE.md
+!LICENSE
+!README.md
+!build.js
+!package.json
+!phovea_product.*
+!Jenkinsfile
+!docker_script.sh
+!docker-compose-patch.*

README.md

@@ -1,6 +1,6 @@
-ordino_product [![Phovea][phovea-image]][phovea-url] [![CircleCI](https://circleci.com/gh/Caleydo/ordino_product.svg?style=svg)](https://circleci.com/gh/Caleydo/ordino_product) [![Dependency Status][daviddm-image]][daviddm-url]
+ordino_product [![Phovea][phovea-image]][phovea-url] [![CircleCI](https://circleci.com/gh/Caleydo/ordino_product.svg?style=svg)](https://circleci.com/gh/Caleydo/ordino_product) 
 =====================
-
+[![Phovea][phovea-image]][phovea-url] [![Build Status][circleci-image]][circleci-url]
 
 
 Installation
@@ -36,9 +36,6 @@ This repository is part of **[Phovea](http://phovea.caleydo.org/)**, a platform
 
 [phovea-image]: https://img.shields.io/badge/Phovea-Product-FABC15.svg
 [phovea-url]: https://phovea.caleydo.org
-[npm-image]: https://badge.fury.io/js/ordino_product.svg
-[npm-url]: https://npmjs.org/package/ordino_product
-[travis-image]: https://travis-ci.org/Caleydo/ordino_product.svg?branch=master
-[travis-url]: https://travis-ci.org/Caleydo/ordino_product
-[daviddm-image]: https://david-dm.org/Caleydo/ordino_product/status.svg
-[daviddm-url]: https://david-dm.org/Caleydo/ordino_product
+[circleci-image]: https://circleci.com/gh/Caleydo/ordino_product.svg?style=shield
+[circleci-url]: https://circleci.com/gh/Caleydo/ordino_product
+