Skip to content
This repository has been archived by the owner on Oct 6, 2019. It is now read-only.

Commit

Permalink
Updated sample documentation to v0.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Caiyeon committed Dec 15, 2017
1 parent 5be7103 commit c0af29c
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 17 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile.compose
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM alpine:3.6

# Version of goldfish to install
ENV GOLDFISH_VERSION=v0.7.4 \
ENV GOLDFISH_VERSION=v0.8.0 \
VAULT_TOKEN=

# Directory to put Goldfish binary in
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2'
services:
vault:
image: vault:0.8.3
image: vault:0.9.0
stdin_open: true
environment:
- VAULT_DEV_ROOT_TOKEN_ID=goldfish
Expand Down
19 changes: 6 additions & 13 deletions docker/docker.hcl
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
# Default configuration for running in docker-compose
# [Required] listener defines how goldfish will listen to incoming connections
listener "tcp" {
# [Required] [Format: "address", "address:port", or ":port"]
# The address and port at which goldfish will listen from
address = "0.0.0.0:8000"

# [Required (unless tls_disable = 1)] the certificate file
tls_cert_file = ""

# [Required (unless tls_disable = 1)] the private key file
tls_key_file = ""
# goldfish's listening address and/or port. Simply ":443" would suffice.
address = "0.0.0.0:8000"

# [Optional] [Default: 0] [Allowed values: 0, 1]
# Set this to 1 to disable HTTPS for goldfish listener
# Leave this empty or equal to 0 unless you know exactly what you're doing
tls_disable = 1
# set to 1 to disable tls & https
tls_disable = 1
}

# [Required] vault defines how goldfish should bootstrap to vault
Expand All @@ -25,7 +17,7 @@ vault {

# [Optional] [Default: 0] [Allowed values: 0, 1]
# Set this to 1 to skip verifying the certificate of vault (e.g. self-signed certs)
tls_skip_verify = 1
tls_skip_verify = 0

# [Required] [Default: "secret/goldfish"]
# This should be a generic secret endpoint where runtime settings are stored
Expand All @@ -43,4 +35,5 @@ vault {

# [Optional] [Default: 0] [Allowed values: 0, 1]
# Set to 1 to disable mlock. Implementation is similar to vault - see vault docs for details
# This option will be ignored on unsupported platforms (e.g Windows)
disable_mlock = 1
2 changes: 1 addition & 1 deletion terraform/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module "goldfish" {

# deployment config variables
wrapping_token = "See wiki for how to generate this"
goldfish_version = "v0.5.1"
goldfish_version = "v0.8.0"
listener = {
address = ":443"
tls_cert_file = ""
Expand Down
2 changes: 1 addition & 1 deletion terraform/goldfish.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ variable "wrapping_token" {
variable "goldfish_version" {
type = "string"
description = "Version of goldfish to deploy"
default = "v0.5.1"
default = "v0.8.0"
}

# configure how goldfish will listen to requests
Expand Down

0 comments on commit c0af29c

Please sign in to comment.