Skip to content

Issues/eddi 2 #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ginccc merged 2 commits into from
Mar 5, 2017
Merged

Issues/eddi 2 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e9574e
fixed EDDI-1
Mobe91 Mar 1, 2017
59dc04f
fixed EDDI-2
Mobe91 Mar 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ v4.0.0

License: Apache License 2.0

Visit http://eddi.labs.ai for further references
Visit http://eddi.labs.ai for further references.

Check out the full documentation [here](https://labsai.atlassian.net/wiki/display/EDDI/).

[![CircleCI](https://circleci.com/gh/labsai/EDDI/tree/master.svg?style=svg)](https://circleci.com/gh/labsai/EDDI/tree/master)

Expand Down Expand Up @@ -40,7 +42,7 @@ technical spec:
- Maven 3


## build project with maven
## Build project with maven
Go to the root directory and execute

mvn clean install
Expand All @@ -53,3 +55,13 @@ Go to the root directory and execute
-DEDDI_ENV=[development/production] -Duser.dir=[LOCAL_PATH_TO_EDDI]\apiserver ai.labs.api.ApiServer
```
3. Go to Browser --> http://localhost:7070

## Docker

For development, use

```
docker-compose -f docker-compose.yml -f docker-compose.local.yml up
```

after running `mvn package`. This builds a local image of EDDI.
82 changes: 82 additions & 0 deletions client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>eddi</artifactId>
<groupId>ai.labs</groupId>
<version>4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>client</artifactId>

<profiles>
<profile>
<id>generate-client</id>
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.20.0</version>
<configuration>
<machine>
<name>default</name>
<autoCreate>true</autoCreate>
</machine>
<images>
<image>
<alias>eddi</alias>
<external>
<type>compose</type>
<composeFile>${project.parent.basedir}/docker-compose.yml</composeFile>
</external>

<run>
<namingStrategy>alias</namingStrategy>
<wait>
<time>20000</time>
<log>Started @</log>
</wait>
</run>
</image>

<image>
<alias>generate-client</alias>
<name>jimschubert/swagger-codegen-cli</name>
<run>
<dependsOn>
<container>eddi</container>
</dependsOn>
<volumes>
<bind>
<volume>${project.build.directory}:/target</volume>
</bind>
</volumes>
<links>
<link>eddi:eddi</link>
</links>
<cmd>generate -i http://eddi:7070/swagger.json -l ${client.lang} -o /target/${client.lang}</cmd>
<wait>
<time>20000</time>
</wait>
</run>
</image>
</images>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>start</goal>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
21 changes: 1 addition & 20 deletions docker-compose.local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,4 @@ version: '2'
services:
eddi:
build: .
ports:
- "7070:7070"
links:
- mongodb
depends_on:
- mongodb
environment:
EDDI_VERSION: 4.0
EDDI_ENV: production
mongodb:
image: mongo:3
#ports: #see override in your own repository with docker-compose.override.yml on each deployed machine for CRITICAL DATA
volumes_from:
- mongodata #see override in your own repositorywith docker-compose.override.yml on each deployed machine for CRITICAL DATA
restart: always
mongodata:
image: alpine
volumes:
- "/persistence/eddimongodb:/data/db"
command: echo Persistence for Mongo
image: labsai/eddi:local
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
depends_on:
- mongodb
environment:
EDDI_VERSION: 4.0
EDDI_VERSION: "4.0"
EDDI_ENV: production
mongodb:
image: mongo:3
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<module>apiserver</module>
<module>caching-definition</module>
<module>caching-impl-infinispan</module>
<module>client</module>
</modules>

<build>
Expand Down