Changes between Version 47 and Version 48 of ComponentRegistryAndEditor

Timestamp:

11/14/19 14:38:58 (5 years ago)

Author:

Twan Goosen

Comment:

updated build/deploy info

ComponentRegistryAndEditor

@@ -41 +41 @@
 
 To serve:
+* Docker
+OR
 * Java 1.7
 * Tomcat 7
@@ -47 +49 @@
 To use the front-end:
 * Web browser with Javascript support
- * Tested with Firefox 43.0, Google Chrome 48.0, Safari 9.0
+ * Tested with Firefox 70.0, Google Chrome 78.0, Safari 9.0
 
 To build:
-* Java 1.7
-* Maven 3
+* Docker
+OR
+* Java 11
+* Maven 3.6+
+
 
 ----
@@ -75 +80 @@
 == Building and Deploying ==
 
-For specific information about building and deploying see [[ComponentRegistryRest#BuildingandDeploying|Building and deploying the REST service]]
-
 === Building ===
 
-There are two separate projects with different build procedures:
-* Maven based build of [[ComponentRegistryRest|REST service]]
-* Grunt based build of [[./ReactFrontEnd|React.js front end]] 
+There are two sets of separate projects with different build procedures:
+1. [[ComponentRegistryRest|REST back end]]
+  * Maven based build of [[ComponentRegistryRest|REST service]]
+    * [https://travis-ci.org/clarin-eric/component-registry-rest Travis project] builds and deploys tagged commits to GitHub
+  * Docker image [https://gitlab.com/CLARIN-ERIC/docker-component-registry-rest|docker-component-registry-rest] which makes an image based on a compiled REST project (typically from a Travis tag build deployed to GitHub)
+2. [[./ReactFrontEnd|React front end]]
+  * npm/webpack based build of React.js front end
+  * Docker image [https://gitlab.com/CLARIN-ERIC/docker-component-registry-front-end|docker-component-registry-front-end] which is based on a multistage build that acts on the sources of the front end project
 
 === Deployment ===
 
-To deploy the REST service including the React front end, deploy the build output (WAR file) of the REST service to a Tomcat instance.
+Deployment happens via a Docker Compose project [https://gitlab.com/CLARIN-ERIC/compose_compreg compose_compreg], which is configured for a specific environment using environment variables (`.env` file). See its documentation for details on the configuration.
 
-For details, see [[ComponentRegistryRest#Deploying|deploying Component Registry REST service]].
+Also see [[ComponentRegistryRest#Deploying|deploying Component Registry REST service]].
 
 ==== Currently Deployed Locations ====
 
-* Production: [http://catalog.clarin.eu/ds/ComponentRegistry/rest/application.wadl http://catalog.clarin.eu/ds/ComponentRegistry/]
-* Testing: [http://alpha-vlo.clarin.eu/component-registry-rest/rest/application.wadl http://alpha-vlo.clarin.eu/component-registry-rest/]
-* ~~Testing: [http://lux16.mpi.nl/ds/ComponentRegistry/rest/application.wadl http://lux16.mpi.nl/ds/ComponentRegistry/rest/] (MPI internal)~~
-
+* Production: [https://catalog.clarin.eu/ds/ComponentRegistry] (running at [[rs236235.rs.hosteurope.de|clarinvm.cesnet.cz]])
+* Testing: [https://catalog.clarin-dev.eu/ds/ComponentRegistry] (running at rs236235.rs.hosteurope.de)
 
 === Dependencies ===
@@ -111 +117 @@
 E.g. for production: [http://catalog.clarin.eu/ds/ComponentRegistry/admin]]. 
 
-Which accounts have administration rights is configured in the context parameter ''eu.clarin.cmdi.componentregistry.adminUsers''.
+Which accounts have administration rights is configured in the context parameter ''eu.clarin.cmdi.componentregistry.adminUsers'', or in case of a Docker deployment via an environment variable (see [https://gitlab.com/CLARIN-ERIC/compose_compreg compose project]).
 
 === Managing accounts ===