You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by vo...@apache.org on 2019/06/29 13:38:44 UTC
[fineract] 05/05: Added license, moved db init file
This is an automated email from the ASF dual-hosted git repository.
vorburger pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
commit b8dadd0419653a4d414916c5c69557970b89b0a4
Author: conradsp <sc...@gmail.com>
AuthorDate: Fri Jun 28 08:49:06 2019 -0500
Added license, moved db init file
---
Dockerfile | 18 ++++++++++++++++++
docker-compose.yml | 20 +++++++++++++++++++-
fineract-db/docker/01-databases.sql | 25 +++++++++++++++++++++++++
fineract-provider/build.gradle | 4 ----
initdb/01-databases.sql | 6 ------
5 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index f5c4e6a..a1b392c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
FROM bitnami/tomcat:7.0.94 as fineract
USER root
diff --git a/docker-compose.yml b/docker-compose.yml
index aacb981..6158808 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
version: '3.7'
services:
fineractmysql:
image: mysql:5.7
volumes:
- - ./initdb:/docker-entrypoint-initdb.d
+ - ./fineract-db/docker:/docker-entrypoint-initdb.d
restart: always
environment:
MYSQL_ROOT_PASSWORD: mysql
diff --git a/fineract-db/docker/01-databases.sql b/fineract-db/docker/01-databases.sql
new file mode 100644
index 0000000..e414001
--- /dev/null
+++ b/fineract-db/docker/01-databases.sql
@@ -0,0 +1,25 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
+# create databases
+CREATE DATABASE IF NOT EXISTS `mifosplatform-tenants`;
+CREATE DATABASE IF NOT EXISTS `mifostenant-default`;
+
+# create root user and grant rights
+GRANT ALL ON *.* TO 'root'@'%';
\ No newline at end of file
diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index 700d06f..dee0cc3 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -125,10 +125,6 @@ rat {
'**/native/**',
'**/wrapper/**',
'**/build/**',
- // docker
- '**/Dockerfile/**',
- '**/docker-compose.yml/**',
- '**/initdb/**',
//Api Docs
'**/api-docs/*.*',
diff --git a/initdb/01-databases.sql b/initdb/01-databases.sql
deleted file mode 100644
index e4fa5fb..0000000
--- a/initdb/01-databases.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-# create databases
-CREATE DATABASE IF NOT EXISTS `mifosplatform-tenants`;
-CREATE DATABASE IF NOT EXISTS `mifostenant-default`;
-
-# create root user and grant rights
-GRANT ALL ON *.* TO 'root'@'%';
\ No newline at end of file