Merge pull request #100 from EBISPOT/develop

.gitignore

@@ -0,0 +1,3 @@
+/target/
+/log/
+/.idea/

.gitlab-ci.yml

@@ -0,0 +1,157 @@
+image: docker:latest
+services:
+  - docker:dind
+
+stages:
+  - build-frontend
+  - build-artefact
+  - build-container
+  - build-frontend-release
+  - build-artefact-release
+  - build-container-release
+  - deploy-sandbox
+  - deploy-fallback
+  - deploy-live
+
+variables:
+  DOCKER_DRIVER: overlay2
+  DOCKER_TLS_CERTDIR: ""
+  REGISTRY_IMAGE: ebispot/ontotools-curation-service
+  SERVICE_NAME: ontotools-curation-service
+
+build-front:
+  image: node:10.15.3
+  stage: build-frontend
+  script:
+    - npm -v
+    - node -v
+    - cd frontend
+    - rm -rf node_modules
+    - npm install
+    - CI=false npm run build:sandbox
+  artifacts:
+    paths:
+      - frontend/build/*
+  only:
+    - develop
+
+maven-build:
+  image: maven:3-jdk-12
+  stage: build-artefact
+  script:
+    - mkdir src/main/webapp
+    - mv frontend/build/* src/main/webapp/
+    - ls -lah src/main/webapp
+    - mvn clean package spring-boot:repackage -DskipTests=true
+  dependencies:
+    - build-front
+  artifacts:
+    paths:
+      - target/*.war
+  only:
+    - develop
+
+build-container:
+  stage: build-container
+  script:
+    - echo "$DOCKER_HUB_PASSWORD" > dhpw.txt
+    - docker login -u "${DOCKER_HUB_USER}" --password-stdin < dhpw.txt
+    - docker build --cache-from $REGISTRY_IMAGE:latest -t $REGISTRY_IMAGE:$CI_COMMIT_SHA .
+    - docker push $REGISTRY_IMAGE:$CI_COMMIT_SHA
+  only:
+    - develop
+
+build-front-release:
+  image: node:10.15.3
+  stage: build-frontend-release
+  script:
+    - npm -v
+    - node -v
+    - cd frontend
+    - rm -rf node_modules
+    - npm install
+    - CI=false npm run build:prod
+  artifacts:
+    paths:
+      - frontend/build/*
+  only:
+    - tags
+
+maven-build-release:
+  image: maven:3-jdk-12
+  stage: build-artefact-release
+  script:
+    - mkdir src/main/webapp
+    - mv frontend/build/* src/main/webapp/
+    - ls -lah src/main/webapp
+    - mvn clean package spring-boot:repackage -DskipTests=true
+  dependencies:
+    - build-front-release
+  artifacts:
+    paths:
+      - target/*.war
+  only:
+    - tags
+
+build-release:
+  variables:
+    GIT_STRATEGY: none
+  stage: build-container-release
+  script:
+  - echo "$DOCKER_HUB_PASSWORD" > dhpw.txt
+  - docker login -u "${DOCKER_HUB_USER}" --password-stdin < dhpw.txt
+  - docker pull $REGISTRY_IMAGE:$CI_COMMIT_SHA
+  - docker tag $REGISTRY_IMAGE:$CI_COMMIT_SHA $REGISTRY_IMAGE:latest
+  - docker tag $REGISTRY_IMAGE:$CI_COMMIT_SHA $REGISTRY_IMAGE:$CI_COMMIT_TAG
+  - docker push $REGISTRY_IMAGE:latest
+  - docker push $REGISTRY_IMAGE:$CI_COMMIT_TAG
+  only:
+  - tags
+
+deploy-sandbox:
+  image: dtzar/helm-kubectl:2.13.1
+  stage: deploy-sandbox
+  script:
+  - echo "Deploy to sandbox server"
+  - mkdir -p /root/.kube
+  - echo ${SANBOX_KUBECONF} | base64 -d > /root/.kube/config
+  - helm init --stable-repo-url https://charts.helm.sh/stable
+  - helm delete --purge ontotools-curation-service || true
+  - helm install --name ontotools-curation-service --set k8Namespace=ontotools,image.repository=$REGISTRY_IMAGE,image.tag=$CI_COMMIT_SHA,image.env.secretsName=ontotools-secrets,image.env.secretsKey=db-pwd ./k8chart/ --wait
+  environment:
+    name: sandbox
+  when: manual
+  only:
+  - develop
+
+deploy-fallback:
+  image: dtzar/helm-kubectl:2.13.1
+  stage: deploy-fallback
+  script:
+  - echo "Deploy to Production fallback server"
+  - mkdir -p /root/.kube
+  - echo ${PFALLBACK_KUBECONFIG} | base64 -d > /root/.kube/config
+  - helm init --stable-repo-url https://charts.helm.sh/stable
+  - helm delete --purge ontotools-curation-service || true
+  - helm install --name ontotools-curation-service --set k8Namespace=ontotools,replicaCount=1,image.env.envName=prod,image.repository=$REGISTRY_IMAGE,image.tag=$CI_COMMIT_SHA,image.env.dbUser=ontotoolscurator,image.env.secretsName=ontotools-secrets,image.env.secretsKey=db-pwd ./k8chart/ --wait
+  environment:
+    name: prod
+  when: manual
+  only:
+  - tags
+
+deploy-live:
+  image: dtzar/helm-kubectl:2.13.1
+  stage: deploy-live
+  script:
+  - echo "Deploy to Production server"
+  - mkdir -p /root/.kube
+  - echo ${PLIVE_KUBECONFIG} | base64 -d > /root/.kube/config
+  - helm init --stable-repo-url https://charts.helm.sh/stable
+  - helm delete --purge ontotools-curation-service || true
+  - helm install --name ontotools-curation-service --set k8Namespace=ontotools,replicaCount=1,image.env.envName=prod,image.repository=$REGISTRY_IMAGE,image.tag=$CI_COMMIT_SHA,image.env.dbUser=ontotoolscurator,image.env.secretsName=ontotools-secrets,image.env.secretsKey=db-pwd ./k8chart/ --wait
+  environment:
+    name: prod
+  when: manual
+  only:
+  - tags

Dockerfile

@@ -0,0 +1,17 @@
+# Import base image
+FROM openjdk:15-buster
+
+RUN apt-get update
+RUN apt-get install -y --no-install-recommends less
+
+# Create log file directory and set permission
+RUN groupadd -r ontotools-curation-service && useradd -r --create-home -g ontotools-curation-service ontotools-curation-service
+RUN if [ ! -d /var/log/ontotools/ ];then mkdir /var/log/ontotools/;fi
+RUN chown -R ontotools-curation-service:ontotools-curation-service /var/log/ontotools
+
+# Move project artifact
+ADD target/ontotools-curation-service-*.war /home/ontotools-curation-service/
+USER ontotools-curation-service
+
+# Launch application server
+ENTRYPOINT exec $JAVA_HOME/bin/java $XMX $XMS -jar -Dspring.profiles.active=$ENVIRONMENT /home/ontotools-curation-service/ontotools-curation-service-*.war

README.md

@@ -1 +1,28 @@
-# Future Curation App
+# Onto-tools Curation App
+
+## Requirements to build and run locally
+
+* Local MongoDB instance running on port `27017`
+* Some test credentials and data added to the DB (if authentication is turned on) - see https://github.com/EBISPOT/ontotools-curator/wiki/Test-data
+* Alternatively:
+  * Add at least one `super` user in the DB in the `users` collection:
+  ```
+  {
+    "name": "Super user",
+    "email": "[email protected]",
+    "superUser": true
+  }
+  ```
+  * Set `ontotools-curation.auth.enabled` to `false` in the `dev` profile in `application.yml`
+
+### Build package
+
+* Run `mvn clean install -Dspring.profiles.active=dev`
+* Alternatively, introduce in a new profile in `application.yml` and use it as active when building
+* At least one active profile has to be specified when building the package
+
+### Build docker container
+* Run the `build.sh` script under `scripts`
+
+### Run locally
+* `java -jar -Dspring.profiles.active=dev target/ontotools-curation-service-*.jar`

frontend/.env

@@ -0,0 +1,4 @@
+REACT_APP_AAPURL="https://api.aai.ebi.ac.uk"
+REACT_APP_APIURL="http://localhost:8080/ontotools/curation/api"
+PUBLIC_URL=""
+

frontend/.env.prod

@@ -0,0 +1,4 @@
+REACT_APP_AAPURL="https://api.aai.ebi.ac.uk"
+REACT_APP_APIURL="/curator"
+PUBLIC_URL="/curator"
+

frontend/.env.sandbox

@@ -0,0 +1,4 @@
+REACT_APP_AAPURL="https://api.aai.ebi.ac.uk"
+REACT_APP_APIURL="/curator"
+PUBLIC_URL="/curator"
+

frontend/.gitignore

@@ -0,0 +1,23 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*

frontend/README.md

@@ -0,0 +1,46 @@
+# Getting Started with Create React App
+
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `yarn start`
+
+Runs the app in the development mode.\
+Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+
+The page will reload if you make edits.\
+You will also see any lint errors in the console.
+
+### `yarn test`
+
+Launches the test runner in the interactive watch mode.\
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+
+### `yarn build`
+
+Builds the app for production to the `build` folder.\
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.\
+Your app is ready to be deployed!
+
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+
+### `yarn eject`
+
+**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+
+If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+
+Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+
+You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+
+## Learn More
+
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+
+To learn React, check out the [React documentation](https://reactjs.org/).