Merge branch 'sprint' into 'master'

Release 2.2.0

Closes OP-108 and OP-58

See merge request open-platform/api!100

Author: Ruslan Molchanov

.gitlab-ci.yml

@@ -12,8 +12,7 @@ stages:
 
 variables:
     DOCKER_DRIVER: overlay2
-    IMAGE_NAME: gcr.io/zinc-computer-205115/apiopenfuture
-    IMAGE_TAG: ${CI_COMMIT_REF_NAME}-${CI_PIPELINE_ID}
+    IMAGE_NAME: openplatform/api
 
 
 ###########################
@@ -84,14 +83,11 @@ build-jar:
 ###########################
 # Packaging
 ###########################
-.registry-auth-script: &registry_auth
-  - docker login -u _json_key -p "${GOOGLE_JSON_TOKEN}" https://gcr.io
-
-
 package-docker:
   stage: package
-  before_script: *registry_auth
   script:
+    - if [[ ${CI_COMMIT_REF_NAME} == master ]]; then export IMAGE_TAG=latest; else export IMAGE_TAG=${CI_COMMIT_REF_NAME}; fi;
+    - docker login -u ${DOCKER_LOGIN} -p ${DOCKER_PASS}
     - docker build -t ${IMAGE_NAME}:${IMAGE_TAG} -f docker/Dockerfile .
     - docker push ${IMAGE_NAME}:${IMAGE_TAG}
   only:
@@ -115,7 +111,6 @@ package-docker:
 
 
 .deploy-to-host-script: &deploy_to_host
-  - ssh ${DEPLOY_USER}@${DEPLOY_HOST} "docker login -u _json_key -p '${GOOGLE_JSON_TOKEN}' https://gcr.io"
   - ssh ${DEPLOY_USER}@${DEPLOY_HOST} "docker pull ${IMAGE_NAME}:${IMAGE_TAG}"
   - |
     ssh ${DEPLOY_USER}@${DEPLOY_HOST} "
@@ -158,6 +153,7 @@ deploy-development:
     NETWORK_URL: $NETWORK_URL_DEV
     ETHEREUM_PRIVATE_KEY: $ETHEREUM_PRIVATE_KEY_DEV
     OPEN_TOKEN_ADDRESS: $OPEN_TOKEN_ADDRESS_DEV
+    IMAGE_TAG: sprint
   before_script: *prepare_key
   script: *deploy_to_host
   only:
@@ -185,10 +181,11 @@ deploy-production:
     NETWORK_URL: $NETWORK_URL_PROD
     ETHEREUM_PRIVATE_KEY: $ETHEREUM_PRIVATE_KEY_PROD
     OPEN_TOKEN_ADDRESS: $OPEN_TOKEN_ADDRESS_PROD
+    IMAGE_TAG: latest
   before_script: *prepare_key
   script: *deploy_to_host
   only:
-    - master
+    - tags
   environment:
     name: production
     url: https://api.openfuture.io
@@ -202,7 +199,7 @@ deploy-production:
 .update-certificates-script: &update_certificates
   - |
     ssh ${DEPLOY_USER}@${DEPLOY_HOST} "
-      docker run --rm -t --name certbot  \
+      docker run --rm --name certbot  \
                  -v /etc/letsencrypt:/etc/letsencrypt \
                  -v /var/www/certbot:/var/www/certbot \
                  -v /var/log/letsencrypt:/var/log/letsencrypt \

CHANGELOG.md

@@ -6,6 +6,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.2.0] - 2018-06-22
+### Added
+- Scaffold templates. Now you can fill in scaffold fields and add additional scaffold properties in one click using predefined templates
+- Scaffold templates samples
+- Transaction split. Now you can add several transaction recipients and set recipients shares after scaffold deployment
+- Transaction split: add an additional recipient
+- Transaction split: set additional recipient's share
+- Transaction split: edit additional recipient's share
+- Transaction split: delete an additional recipient
+
+### Changed
+- Unit tests
+
 ## [2.1.0] - 2018-06-18
 ### Added
 - Public API Specification
@@ -61,5 +74,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - "Withdraw" button is removed
 
 [Unreleased]: https://github.com/OpenFuturePlatform/open-api/compare/master...sprint
+[2.2.0]: https://github.com/OpenFuturePlatform/open-api/compare/v2.1.0...v2.2.0
 [2.1.0]: https://github.com/OpenFuturePlatform/open-api/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/OpenFuturePlatform/open-api/compare/8ea69084ef657f66976518827873c9c922970ce6...v2.0.0

build.gradle

@@ -1,10 +1,10 @@
 plugins {
     id 'jacoco'
     id "idea"
-    id "org.jetbrains.kotlin.jvm" version "1.2.41"
-    id "org.jetbrains.kotlin.kapt" version "1.2.41"
-    id "org.jetbrains.kotlin.plugin.spring" version "1.2.41"
-    id "org.jetbrains.kotlin.plugin.jpa" version "1.2.41"
+    id "org.jetbrains.kotlin.jvm" version "1.2.50"
+    id "org.jetbrains.kotlin.kapt" version "1.2.50"
+    id "org.jetbrains.kotlin.plugin.spring" version "1.2.50"
+    id "org.jetbrains.kotlin.plugin.jpa" version "1.2.50"
     id "org.springframework.boot" version "2.0.2.RELEASE"
 }