Skip to content

Commit

Permalink
update docker for release v0.4.0 (cadence-workflow#1209)
Browse files Browse the repository at this point in the history
  • Loading branch information
samarabbas authored Oct 27, 2018
1 parent 0d10b48 commit c0cb4e5
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 10 deletions.
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \

RUN pip install cqlsh

ENV GOLANG_VERSION 1.10.1
ENV GOLANG_VERSION 1.11.1
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
ENV GOLANG_DOWNLOAD_SHA256 72d820dec546752e5a8303b33b009079c15c2390ce76d67cf514991646c6127b
ENV GOLANG_DOWNLOAD_SHA256 2871270d8ff0c8c69f161aaae42f9f28739855ff5c5204752a8d92a1c9f63993

RUN set -eux; \
wget -O golang.tar.gz "$GOLANG_DOWNLOAD_URL" \
Expand All @@ -61,7 +61,7 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
# get and compile cadence-server
ENV CADENCE_HOME $GOPATH/src/github.com/uber/cadence

RUN go get -u github.com/Masterminds/glide
RUN go get -u github.com/golang/dep/cmd/dep
RUN go get -u github.com/golang/lint/golint

RUN git clone https://github.com/uber/cadence.git $CADENCE_HOME
Expand Down
19 changes: 14 additions & 5 deletions docker/config_template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,21 @@ log:
stdout: true
level: "${LOG_LEVEL}"

cassandra:
hosts: "${CASSANDRA_SEEDS}"
keyspace: "${KEYSPACE}"
visibilityKeyspace: "${VISIBILITY_KEYSPACE}"
consistency: "${CASSANDRA_CONSISTENCY}"
persistence:
defaultStore: cass-default
visibilityStore: cass-visibility
numHistoryShards: ${NUM_HISTORY_SHARDS}
datastores:
cass-default:
cassandra:
hosts: "${CASSANDRA_SEEDS}"
keyspace: "${KEYSPACE}"
consistency: "${CASSANDRA_CONSISTENCY}"
cass-visibility:
cassandra:
hosts: "${CASSANDRA_SEEDS}"
keyspace: "${VISIBILITY_KEYSPACE}"
consistency: "${CASSANDRA_CONSISTENCY}"

ringpop:
name: cadence
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
- "8125:8125"
- "8126:8126"
cadence:
image: ubercadence/server:0.3.15
image: ubercadence/server:0.4.0
ports:
- "7933:7933"
- "7934:7934"
Expand Down
2 changes: 1 addition & 1 deletion docker/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ init_env() {
fi

if [ -z "$LOG_LEVEL" ]; then
export LOG_LEVEL="debug"
export LOG_LEVEL="info"
fi
}

Expand Down

0 comments on commit c0cb4e5

Please sign in to comment.