Skip to content

Commit 6ffd422

Browse files
joasilvajoasilva
authored
Merge pull request #40 from ATTX-project/dev
Dev
2 parents 120d3b9 + 60b25cf commit 6ffd422

File tree

4 files changed

+154
-109
lines changed

4 files changed

+154
-109
lines changed

‎README.md

+37-24
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,38 @@
11
# platform-deployment
2-
Configuration and tools for deploying the PAAS Solution based on ATTX components to different environments.
3-
4-
The ATTX PAAS stack is deployed as a Docker Compose app, and thus is requires that Docker Engine and Docker Compose are available beforehand in your environment (cf. https://docs.docker.com/engine/getstarted/step_one/ and https://docs.docker.com/compose/install/).
5-
6-
# How to generate docker-compose-file with Gradle
7-
1. Download docker-compose.yml (no data persistency) or docker-compose.prod.yml (local data volume for persistency)
8-
2. Default scenario (no data persistency):
9-
   `$ gradle createComposeFile`
10-
3. Alternate scenario (data persistency):
11-
   `$ docker-compose -f build/docker-compose.yml up`
12-
13-
14-
# How to deploy and start the ATTX platform stack manually
15-
1. Download docker-compose.yml (no data persistency) or docker-compose.prod.yml (local data volume for persistency)
16-
2. Default scenario (no data persistency):
17-
   `$ docker-compose up`
18-
3. Alternate scenario (data persistency):
19-
   `$ docker-compose -f docker-compose.prod.yml up`
20-
21-
# How to deploy and start the ATTX platform automatically in RHEL7 and Centos7:
22-
1. Pre-requisite: sharing your SSH public keys with the target host
23-
2. Download the "single_host_deployment.yml" Ansible playbook
24-
3. Edit the "hosts" and "remote_user" (must have sudo rights) as appropriate
25-
4. Run the ansible-playbook (e.g. `ansible-playbook -i hosts --ask-become-pass single_host_deployment.yml`)
2+
3+
This repository contains configurations for building, publishing, deploying and running ATTX components.
4+
5+
Content of the repository:
6+
* ATTX component images
7+
* attx-es5
8+
* attx-fuseki
9+
* dc-elasticsearch-siren
10+
* gm-API
11+
* uv-attx-dpus
12+
* uv-attx-shared
13+
* wf-API
14+
* Platform tests
15+
* pd-feature-tests
16+
* Local VM deployment
17+
* swarm-mode-vagrant
18+
* Cloud deployment
19+
* swarm-mode-cpouta
20+
21+
22+
More detailed information can be found in (https://attx-project.github.io/)
23+
24+
## ATTX componens
25+
26+
Gradle configurations define two environments, dev (default) and release, which can be set with -Penv=[environment] parameter. common.gradle contains the main shared configuration for different environments, such as artifact and image tags and repository URLs.
27+
28+
## Running tests
29+
30+
* [Containerized testing](https://attx-project.github.io/Containerized-testing.html)
31+
32+
## Provisioning
33+
34+
* [OpenStack](https://attx-project.github.io/Provisioning-ATTX-Components-on-CSC-Open-Stack-cPouta.html)
35+
36+
## Deployment
37+
38+
* [SWARM in cloud](https://attx-project.github.io/Deploying-ATTX-Components-on-Docker-Swarm.html)

‎dcompose/docker-compose.yml

+69-38
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,94 @@
11
version: '2'
22
services:
3-
frontend:
4-
image: tenforce/unified-views-frontend:latest
5-
ports:
6-
- "8080:8080"
7-
volumes_from:
8-
- shared
9-
links:
10-
- mysql:mysql
11-
- backend:backend
12-
- virtuoso:virtuoso
3+
4+
mysql:
5+
image: tenforce/unified-views-mariadb:feat-compact-modular
6+
volumes:
7+
- ./uv-data/mysql:/var/lib/mysql
8+
environment:
9+
- MYSQL_ROOT_PASSWORD=iamroot!
1310

1411
shared:
15-
image: tenforce/unified-views-shared:latest
12+
image: attxproject/uv-attx-shared:1.0
1613

1714
backend:
1815
image: tenforce/unified-views-backend:latest
19-
volumes_from:
20-
- shared
2116
links:
2217
- mysql:mysql
23-
- virtuoso:virtuoso
18+
volumes_from:
19+
- mysql
20+
- shared
2421

25-
mysql:
26-
image: tenforce/unified-views-mariadb
27-
environment:
28-
- MYSQL_ROOT_PASSWORD=iamroot!
22+
frontend:
23+
image: tenforce/unified-views-frontend:latest
24+
volumes_from:
25+
- backend
26+
- shared
27+
ports:
28+
- 8080:8080
29+
depends_on:
30+
- shared
31+
- mysql
2932

3033
uv-dpus:
31-
image: tenforce/unified-views-add-dpus
32-
links:
33-
- frontend:frontend
34+
image: tenforce/unified-views-add-dpus:latest
3435
depends_on:
35-
- mysql
36+
- mysql
37+
- backend
38+
- frontend
3639

3740
attx-dpus:
38-
image: attxproject/uv-attx-dpus
39-
links:
40-
- frontend:frontend
41+
image: attxproject/uv-attx-dpus:1.0
4142
depends_on:
4243
- mysql
43-
44-
virtuoso:
45-
image: tenforce/virtuoso:virtuoso-v7.2.0-latest
44+
- backend
45+
- uv-dpus
4646

4747
wfapi:
48-
image: attxproject/wfapi
48+
image: attxproject/wf-api:1.0
4949
ports:
50-
- "4301:4301"
51-
links:
52-
- mysql:mysql
50+
- 4301:4301
51+
depends_on:
52+
- mysql
53+
54+
essiren:
55+
image: attxproject/essiren:1.0
56+
volumes:
57+
- ./attx-data/essiren:/usr/share/elasticsearch/data
58+
ports:
59+
- 9200:9200
60+
- 9300:9300
5361

54-
elasticsearch:
55-
image: attxproject/elasticsearch
62+
elasticsearch5:
63+
image: attxproject/attx-es5:1.0
64+
volumes:
65+
- ./attx-data/elasticsearch5:/usr/share/elasticsearch/data
5666
ports:
57-
- "9200:9200"
58-
- "9300:9300"
67+
- 9210:9210
68+
- 9310:9310
5969

6070
fuseki:
61-
image: stain/jena-fuseki
71+
image: attxproject/attx-fuseki:1.0
72+
volumes:
73+
- ./attx-data/elasticsearch5:/usr/share/elasticsearch/data
74+
environment:
75+
- ADMIN_PASSWORD=pw123
76+
ports:
77+
- 3030:3030
78+
79+
gmapi:
80+
image: attxproject/gm-api:1.0
81+
volumes:
82+
- ./attx-data/gm-api:/app/data
6283
ports:
63-
- "3030:3030"
84+
- 4302:4302
85+
links:
86+
- fuseki:fuseki
87+
- elasticsearch5:elasticsearch5
88+
- wfapi:wfapi
89+
depends_on:
90+
- frontend
91+
- fuseki
92+
- essiren
93+
- elasticsearch5
94+
- wfapi

‎pd-feature-tests/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ dcompose {
127127
if (testSet == "localhost") {
128128
portBindings = ['3030:3030']
129129
}
130+
env = ['ADMIN_PASSWORD=pw123']
130131
}
131132

132133
essiren {

‎swarm-mode-cpouta/attx-swarm.yml

+47-47
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
version: '3'
2-
services:
1+
version: '3'
2+
services:
33

44
mysql:
55
image: tenforce/unified-views-mariadb:feat-compact-modular
@@ -11,10 +11,10 @@ services:
1111
- attx
1212
deploy:
1313
placement:
14-
constraints: [node.hostname == attx-swarm-1]
14+
constraints: [node.hostname == attx-swarm-1]
1515

1616
shared:
17-
image: attxtest/uv-attx-shared:latest
17+
image: attxproject/uv-attx-shared:1.0
1818
volumes:
1919
- shared_config:/config
2020
- shared_dpu:/unified-views/dpu
@@ -26,39 +26,39 @@ services:
2626
placement:
2727
constraints: [node.hostname == attx-swarm-1]
2828

29-
backend:
30-
image: tenforce/unified-views-backend:latest
31-
volumes:
32-
- shared_config:/config
33-
- shared_dpu:/unified-views/dpu
34-
- shared_lib:/unified-views/lib
29+
backend:
30+
image: tenforce/unified-views-backend:latest
31+
volumes:
32+
- shared_config:/config
33+
- shared_dpu:/unified-views/dpu
34+
- shared_lib:/unified-views/lib
3535
- shared_scripts:/unified-views/scripts
36-
networks:
37-
- attx
38-
depends_on:
39-
- shared
40-
- mysql
41-
deploy:
42-
placement:
43-
constraints: [node.hostname == attx-swarm-1]
36+
networks:
37+
- attx
38+
depends_on:
39+
- shared
40+
- mysql
41+
deploy:
42+
placement:
43+
constraints: [node.hostname == attx-swarm-1]
4444

45-
frontend:
46-
image: tenforce/unified-views-frontend:latest
47-
volumes:
45+
frontend:
46+
image: tenforce/unified-views-frontend:latest
47+
volumes:
4848
- shared_config:/config
49-
- shared_dpu:/unified-views/dpu
50-
- shared_lib:/unified-views/lib
49+
- shared_dpu:/unified-views/dpu
50+
- shared_lib:/unified-views/lib
5151
- shared_scripts:/unified-views/scripts
52-
ports:
53-
- 8080:8080
54-
networks:
55-
- attx
56-
depends_on:
57-
- shared
58-
- backend
59-
deploy:
60-
placement:
61-
constraints: [node.hostname == attx-swarm-1]
52+
ports:
53+
- 8080:8080
54+
networks:
55+
- attx
56+
depends_on:
57+
- shared
58+
- backend
59+
deploy:
60+
placement:
61+
constraints: [node.hostname == attx-swarm-1]
6262

6363
uv-dpus:
6464
image: tenforce/unified-views-add-dpus:latest
@@ -70,7 +70,7 @@ services:
7070
- frontend
7171

7272
attx-dpus:
73-
image: attxtest/uv-attx-dpus:latest
73+
image: attxproject/uv-attx-dpus:1.0
7474
networks:
7575
- attx
7676
depends_on:
@@ -79,14 +79,14 @@ services:
7979
- uv-dpus
8080

8181
wfapi:
82-
image: attxtest/wf-api:latest
82+
image: attxproject/wf-api:1.0
8383
networks:
8484
- attx
8585
depends_on:
8686
- mysql
8787

8888
essiren:
89-
image: attxtest/essiren:latest
89+
image: attxproject/essiren:1.0
9090
volumes:
9191
- /attx-data/essiren:/usr/share/elasticsearch/data
9292
networks:
@@ -100,7 +100,7 @@ services:
100100

101101

102102
elasticsearch5:
103-
image: attxtest/attx-es5:latest
103+
image: attxproject/attx-es5:1.0
104104
volumes:
105105
- /attx-data/elasticsearch5:/usr/share/elasticsearch/data
106106
networks:
@@ -113,9 +113,9 @@ services:
113113
constraints: [node.hostname == attx-swarm-2]
114114

115115
fuseki:
116-
image: attxtest/attx-fuseki:latest
116+
image: attxproject/attx-fuseki:1.0
117117
volumes:
118-
- /attx-data/fuseki:/data/fuseki
118+
- /attx-data/fuseki:/data/fuseki
119119
networks:
120120
- attx
121121
environment:
@@ -125,7 +125,7 @@ services:
125125
constraints: [node.hostname == attx-swarm-2]
126126

127127
gmapi:
128-
image: attxtest/gm-api:latest
128+
image: attxproject/gm-api:1.0
129129
volumes:
130130
- /attx-data/gm-api:/app/data
131131
networks:
@@ -140,12 +140,12 @@ services:
140140
placement:
141141
constraints: [node.hostname == attx-swarm-2]
142142

143-
networks:
144-
attx:
145-
driver: "overlay"
146-
147-
volumes:
148-
shared_config:
149-
shared_dpu:
143+
networks:
144+
attx:
145+
driver: "overlay"
146+
147+
volumes:
148+
shared_config:
149+
shared_dpu:
150150
shared_lib:
151151
shared_scripts:

0 commit comments

Comments
 (0)