Skip to content

Commit 84b20ad

Browse files
author
Ino Murko
committed
bump vault to 007
1 parent e8684ca commit 84b20ad

File tree

6 files changed

+29
-29
lines changed

6 files changed

+29
-29
lines changed

‎contracts/docker-compose.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,24 +76,24 @@ services:
7676
retries: 5
7777

7878
vault_server:
79-
image: gcr.io/omisego-development/omgnetwork/vault:0.0.6
79+
image: gcr.io/omisego-development/omgnetwork/vault:0.0.7
8080
entrypoint: >
8181
/bin/sh -c "
8282
sleep 2
8383
84-
/home/vault/config/entrypoint.sh
84+
/vault/config/entrypoint.sh
8585
"
8686
ports:
8787
- "8200:8200"
8888
links:
8989
- "geth"
9090
volumes:
91-
- "./immutability/ca:/home/vault/ca:rw"
91+
- "./immutability/ca:/vault/ca:rw"
9292
- "./immutability/ca/certs/:/etc/ssl/certs/"
93-
- "./immutability/config:/home/vault/config:rw"
93+
- "./immutability/config:/vault/config:rw"
9494
healthcheck:
9595
test: vault status --tls-skip-verify
9696
interval: 5s
9797
timeout: 3s
9898
retries: 5
99-
99+

‎contracts/immutability/config/entrypoint.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
# Vault running in the container must listen on a different port.
44

5-
VAULT_CREDENTIALS="/home/vault/config/unseal.json"
5+
VAULT_CREDENTIALS="/vault/config/unseal.json"
66

7-
CONFIG_DIR="/home/vault/config"
7+
CONFIG_DIR="/vault/config"
88

99
CA_CERT="$CONFIG_DIR/ca.crt"
1010
CA_KEY="$CONFIG_DIR/ca.key"
@@ -108,7 +108,7 @@ function gencerts {
108108

109109
gencerts
110110

111-
nohup vault server -log-level=debug -config /home/vault/config/vault.hcl &
111+
nohup vault server -log-level=debug -config /vault/config/vault.hcl &
112112
VAULT_PID=$!
113113

114114
function unseal() {
@@ -126,8 +126,8 @@ function configure_plugin {
126126

127127
# just testing for now
128128
plugin_file="${plugin_file}"
129-
ls -latr /home/vault/plugins
130-
sha256sum=`cat /home/vault/plugins/SHA256SUMS | awk '{print $1}'`
129+
ls -latr /vault/plugins
130+
sha256sum=`cat /vault/plugins/SHA256SUMS | awk '{print $1}'`
131131
vault write sys/plugins/catalog/secret/${plugin_file} \
132132
sha_256="$sha256sum" \
133133
command="$plugin_file --ca-cert=$CA_CERT --client-cert=$TLS_CERT --client-key=$TLS_KEY"

‎contracts/immutability/config/vault.hcl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ disable_mlock = "true"
33
max_lease_ttl = "720h"
44

55
backend "file" {
6-
path = "/home/vault/config/data"
6+
path = "/vault/config/data"
77
}
88

99
ui = "false"
1010

1111
api_addr = "https://localhost:8200"
12-
plugin_directory = "/home/vault/plugins"
12+
plugin_directory = "/vault/plugins"
1313
listener "tcp" {
1414
address = "0.0.0.0:8200"
15-
tls_cert_file = "/home/vault/config/my-service.crt"
16-
tls_client_ca_file = "/home/vault/config/ca.crt"
17-
tls_key_file = "/home/vault/config/my-service.key"
15+
tls_cert_file = "/vault/config/my-service.crt"
16+
tls_client_ca_file = "/vault/config/ca.crt"
17+
tls_key_file = "/vault/config/my-service.key"
1818
tls_require_and_verify_client_cert = "false"
1919
}

‎contracts_reorg/docker-compose.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,18 @@ services:
6969
ipv4_address: 172.25.0.105
7070

7171
vault_server:
72-
image: gcr.io/omisego-development/omgnetwork/vault:0.0.6
72+
image: gcr.io/omisego-development/omgnetwork/vault:0.0.7
7373
entrypoint: >
7474
/bin/sh -c "
7575
sleep 2
76-
/home/vault/config/entrypoint.sh
76+
/vault/config/entrypoint.sh
7777
"
7878
ports:
7979
- "8200:8200"
8080
volumes:
81-
- "./immutability/ca:/home/vault/ca:rw"
81+
- "./immutability/ca:/vault/ca:rw"
8282
- "./immutability/ca/certs/:/etc/ssl/certs/"
83-
- "./immutability/config:/home/vault/config:rw"
83+
- "./immutability/config:/vault/config:rw"
8484
healthcheck:
8585
test: vault status --tls-skip-verify
8686
interval: 5s

‎contracts_reorg/immutability/config/entrypoint.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
# Vault running in the container must listen on a different port.
44

5-
VAULT_CREDENTIALS="/home/vault/config/unseal.json"
5+
VAULT_CREDENTIALS="/vault/config/unseal.json"
66

7-
CONFIG_DIR="/home/vault/config"
7+
CONFIG_DIR="/vault/config"
88

99
CA_CERT="$CONFIG_DIR/ca.crt"
1010
CA_KEY="$CONFIG_DIR/ca.key"
@@ -108,7 +108,7 @@ function gencerts {
108108

109109
gencerts
110110

111-
nohup vault server -log-level=debug -config /home/vault/config/vault.hcl &
111+
nohup vault server -log-level=debug -config /vault/config/vault.hcl &
112112
VAULT_PID=$!
113113

114114
function unseal() {
@@ -126,8 +126,8 @@ function configure_plugin {
126126

127127
# just testing for now
128128
plugin_file="${plugin_file}"
129-
ls -latr /home/vault/plugins
130-
sha256sum=`cat /home/vault/plugins/SHA256SUMS | awk '{print $1}'`
129+
ls -latr /vault/plugins
130+
sha256sum=`cat /vault/plugins/SHA256SUMS | awk '{print $1}'`
131131
vault write sys/plugins/catalog/secret/${plugin_file} \
132132
sha_256="$sha256sum" \
133133
command="$plugin_file --ca-cert=$CA_CERT --client-cert=$TLS_CERT --client-key=$TLS_KEY"

‎contracts_reorg/immutability/config/vault.hcl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ disable_mlock = "true"
33
max_lease_ttl = "720h"
44

55
backend "file" {
6-
path = "/home/vault/config/data"
6+
path = "/vault/config/data"
77
}
88

99
ui = "false"
1010

1111
api_addr = "https://localhost:8200"
12-
plugin_directory = "/home/vault/plugins"
12+
plugin_directory = "/vault/plugins"
1313
listener "tcp" {
1414
address = "0.0.0.0:8200"
15-
tls_cert_file = "/home/vault/config/my-service.crt"
16-
tls_client_ca_file = "/home/vault/config/ca.crt"
17-
tls_key_file = "/home/vault/config/my-service.key"
15+
tls_cert_file = "/vault/config/my-service.crt"
16+
tls_client_ca_file = "/vault/config/ca.crt"
17+
tls_key_file = "/vault/config/my-service.key"
1818
tls_require_and_verify_client_cert = "false"
1919
}

0 commit comments

Comments
 (0)