Skip to content

Commit 223ba19

Browse files
authored
Merge pull request #7 from tokend/v3.5
V3.5
2 parents df7216f + 2bb36ef commit 223ba19

File tree

3 files changed

+21
-7
lines changed

3 files changed

+21
-7
lines changed

configs/client.js

+1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ document.ENV = {
44
NETWORK_PASSPHRASE: 'TokenD Developer Network',
55
KEY_SERVER_ADMIN: 'http://localhost:8000/_/adks',
66
VALIDATE_EMAILS: false,
7+
WEB_CLIENT_URL: 'http://localhost:8060'
78
}

docker-compose.yml

+19-6
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ services:
3434
volumes:
3535
- adks-data:/pgdata
3636
core:
37-
image: tokend/core:3.4.0
37+
image: tokend/core:3.5.0
3838
depends_on:
3939
- janus
4040
restart: unless-stopped
@@ -48,8 +48,10 @@ services:
4848
volumes:
4949
- ./configs/core.ini:/core-config.ini
5050
- core-data:/data
51+
labels:
52+
- "autoheal=true"
5153
horizon:
52-
image: tokend/horizon:3.3.3
54+
image: tokend/horizon:3.4.0
5355
depends_on:
5456
- core
5557
restart: unless-stopped
@@ -61,7 +63,7 @@ services:
6163
volumes:
6264
- ./configs/horizon.yaml:/config.yaml
6365
api:
64-
image: tokend/identity:4.3.2
66+
image: tokend/identity:4.4.0
6567
restart: unless-stopped
6668
depends_on:
6769
- horizon
@@ -82,7 +84,7 @@ services:
8284
volumes:
8385
- api-data:/pgdata
8486
initscripts:
85-
image: tokend/terraform-provider-tokend:0.3.0
87+
image: tokend/terraform-provider-tokend:1.1.0
8688
depends_on:
8789
- horizon
8890
- storage
@@ -92,14 +94,14 @@ services:
9294
entrypoint: ""
9395
command: /opt/config/apply.sh
9496
web_client:
95-
image: tokend/web-client:1.7.0-rc.4
97+
image: tokend/web-client:1.8.0
9698
restart: unless-stopped
9799
volumes:
98100
- ./configs/client.js:/usr/share/nginx/html/static/env.js
99101
ports:
100102
- 8060:80
101103
admin_client:
102-
image: tokend/admin-client:1.7.0-rc.4
104+
image: tokend/admin-client:1.8.0
103105
restart: unless-stopped
104106
volumes:
105107
- ./configs/client.js:/usr/share/nginx/html/static/env.js
@@ -142,6 +144,17 @@ services:
142144
- KV_VIPER_FILE=/config.yaml
143145
command: "run"
144146

147+
## 3rd party
148+
149+
autoheal:
150+
image: willfarrell/autoheal
151+
restart: unless-stopped
152+
environment:
153+
- AUTOHEAL_START_PERIOD=60
154+
- AUTOHEAL_DEFAULT_STOP_TIMEOUT=30
155+
volumes:
156+
- /var/run/docker.sock:/var/run/docker.sock
157+
145158
##
146159
## Integration services
147160
##

terraform/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ provider "tokend" {
1818
}
1919

2020
module "tokend_vanilla" {
21-
source = "git::https://github.com/tokend/terraform-tokend-vanilla.git?ref=v1.0.0"
21+
source = "git::https://github.com/tokend/terraform-tokend-vanilla.git?ref=v1.1.0"
2222
}

0 commit comments

Comments
 (0)