Release 6.0.0-beta-1

amalto · Sep 6, 2019 · c2561de · c2561de
1 parent 7fb8279
commit c2561de
Show file tree

Hide file tree

Showing 20 changed files with 889 additions and 59 deletions.
diff --git a/.env.sample b/.env.sample
@@ -5,6 +5,7 @@ PLATFORM6_ROOT=~/platform6/instances
 # - 5.24.7
 # - 6.0.0-alpha-4
 # - 6.0.0-alpha-5
-PLATFORM6_VERSION=6.0.0-alpha-5
+# - 6.0.0-beta-1
+PLATFORM6_VERSION=6.0.0-beta-1
 
 # Generated environment variables below, please do not edit
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -27,6 +27,7 @@ services:
     image: $P6CORE_IMAGE_ID
     depends_on:
       - pgsql
+      - demobc
     volumes:
       - $INSTANCE_DATA_PATH/p6core.data:/opt/b2box5.data
     links:
@@ -54,8 +55,6 @@ services:
       - LOG_LEVEL=3
       - PROXY_NO_SSL=true
       - PROXY_NO_CACHE=true
-    links:
-      - p6core:b2box
     ports:
       - "8480:8480"
     networks:
@@ -64,9 +63,10 @@ services:
   # Local Ethereum blockchain used by the Demo App, delete this container in production
   demobc:
     container_name: demobc
-    image: pegasyseng/pantheon:latest
+    image: pegasyseng/pantheon:1.2.2
     command:
       --network=dev
+      --data-path=/var/lib/pantheon
       --rpc-http-enabled
       --rpc-ws-enabled
       --host-whitelist="all"

diff --git a/reference_data/6.0.0-beta-1/p6core.data/conf/application.conf b/reference_data/6.0.0-beta-1/p6core.data/conf/application.conf
@@ -0,0 +1,5 @@
+p6auth {
+    remote.provider {        
+    	url: "https://login.amalto.io/apis/v2/b2auth"
+    }
+}
diff --git a/reference_data/6.0.0-beta-1/p6core.data/conf/pgsqljdbc.properties b/reference_data/6.0.0-beta-1/p6core.data/conf/pgsqljdbc.properties
@@ -0,0 +1,4 @@
+jdbc.driverClassName=org.postgresql.Driver
+jdbc.url=jdbc:postgresql://database:5432/b2box
+jdbc.username=b2box
+jdbc.password=qsd56fg
diff --git a/reference_data/6.0.0-beta-1/p6core.data/conf/reportingjdbc.properties b/reference_data/6.0.0-beta-1/p6core.data/conf/reportingjdbc.properties
@@ -0,0 +1,11 @@
+######################################################################
+# b2box reporting data source configuration
+######################################################################
+
+# PGSQL
+jdbc.driverClassName=org.postgresql.Driver
+jdbc.url=jdbc:postgresql://database:5432/b2box
+jdbc.username=b2box
+jdbc.password=qsd56fg
+jdbc.validation.query=select 1
+dialect.mapper=com.amalto.b2box.core.store.impl.dialect.pgsqlxml.mappers.proc.ReportingDataSourceProcMapper
diff --git a/reference_data/6.0.0-beta-1/p6core.data/lib/Tahoma_font.jar b/reference_data/6.0.0-beta-1/p6core.data/lib/Tahoma_font.jar
diff --git a/reference_data/6.0.0-beta-1/p6core.data/lib/demo-app-smart-contract-1.1.jar b/reference_data/6.0.0-beta-1/p6core.data/lib/demo-app-smart-contract-1.1.jar
diff --git a/reference_data/6.0.0-beta-1/p6core.data/logs/.marker b/reference_data/6.0.0-beta-1/p6core.data/logs/.marker
@@ -0,0 +1 @@
+Marker file to ensure folder is tracked in git
diff --git a/reference_data/6.0.0-beta-1/p6core.data/resources/certificates/readme.txt b/reference_data/6.0.0-beta-1/p6core.data/resources/certificates/readme.txt
@@ -0,0 +1 @@
+Note: PKI certificate files should be stored in this folder.
diff --git a/reference_data/6.0.0-beta-1/p6core.data/resources/ftpd/conf/users/.marker b/reference_data/6.0.0-beta-1/p6core.data/resources/ftpd/conf/users/.marker
@@ -0,0 +1 @@
+Marker file to ensure folder is tracked in git
diff --git a/reference_data/6.0.0-beta-1/p6core.data/resources/ftpd/repository/.marker b/reference_data/6.0.0-beta-1/p6core.data/resources/ftpd/repository/.marker
@@ -0,0 +1 @@
+Marker file to ensure folder is tracked in git
diff --git a/reference_data/6.0.0-beta-1/p6core.data/resources/jmsdata/.marker b/reference_data/6.0.0-beta-1/p6core.data/resources/jmsdata/.marker
@@ -0,0 +1 @@
+Marker file to ensure folder is tracked in git
diff --git a/reference_data/6.0.0-beta-1/p6core.data/resources/schemas/.marker b/reference_data/6.0.0-beta-1/p6core.data/resources/schemas/.marker
@@ -0,0 +1 @@
+Marker file to ensure folder is tracked in git
diff --git a/reference_data/6.0.0-beta-1/p6core.data/resources/sshd/conf/sftp.hostkey.ser b/reference_data/6.0.0-beta-1/p6core.data/resources/sshd/conf/sftp.hostkey.ser
diff --git a/reference_data/6.0.0-beta-1/p6core.data/resources/sshd/repository/.marker b/reference_data/6.0.0-beta-1/p6core.data/resources/sshd/repository/.marker
@@ -0,0 +1 @@
+Marker file to ensure folder is tracked in git
diff --git a/reference_data/6.0.0-beta-1/p6core.data/resources/templates/.marker b/reference_data/6.0.0-beta-1/p6core.data/resources/templates/.marker
@@ -0,0 +1 @@
+Marker file to ensure folder is tracked in git
diff --git a/reference_data/6.0.0-beta-1/p6core.data/webapps/.marker b/reference_data/6.0.0-beta-1/p6core.data/webapps/.marker
@@ -0,0 +1 @@
+Marker file to ensure folder is tracked in git
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Note: PKI certificate files should be stored in this folder.