Skip to content

Commit

Permalink
Merge pull request #44 from temporalio/rh-updates
Browse files Browse the repository at this point in the history
Update to recent Temporal version.
  • Loading branch information
robholland committed Jul 18, 2023
2 parents f06ca38 + e5600ba commit 0425e40
Show file tree
Hide file tree
Showing 9 changed files with 1,241 additions and 303 deletions.
13 changes: 6 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.17 AS base
FROM golang:1.20 AS base

WORKDIR /go/src/background-checks

Expand All @@ -20,14 +20,13 @@ RUN go install -v ./cli/bgc-backend
RUN go install -v ./cli/bgc-company
RUN go install -v ./cli/bgc-candidate
RUN go install -v ./cli/bgc-researcher
RUN go install -v ./temporal/dataconverter-plugin
RUN go install -v ./temporal/dataconverter-server

FROM golang:1.17 AS app
FROM golang:1.20 AS app

ENV TEMPORAL_CLI_PLUGIN_DATA_CONVERTER=dataconverter-plugin

COPY --from=temporalio/admin-tools:1.14.0 /usr/local/bin/tctl /usr/local/bin/tctl
COPY --from=build /go/bin/dataconverter-plugin /usr/local/bin/dataconverter-plugin
COPY --from=temporalio/admin-tools:1.21.1 /usr/local/bin/tctl /usr/local/bin/tctl
COPY --from=temporalio/admin-tools:1.21.1 /usr/local/bin/temporal /usr/local/bin/temporal
COPY --from=build /go/bin/dataconverter-server /usr/local/bin/dataconverter-server

COPY --from=build /go/bin/bgc-backend /usr/local/bin/bgc-backend
COPY --from=build /go/bin/bgc-company /usr/local/bin/bgc-company
Expand Down
40 changes: 14 additions & 26 deletions docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
version: "3.5"
services:
elasticsearch:
environment:
- cluster.routing.allocation.disk.threshold_enabled=true
- cluster.routing.allocation.disk.watermark.low=512mb
- cluster.routing.allocation.disk.watermark.high=256mb
- cluster.routing.allocation.disk.watermark.flood_stage=128mb
- discovery.type=single-node
- ES_JAVA_OPTS=-Xms100m -Xmx100m
image: elasticsearch:7.16.2
postgresql:
environment:
POSTGRES_PASSWORD: temporal
Expand All @@ -17,36 +8,32 @@ services:
temporal:
depends_on:
- postgresql
- elasticsearch
environment:
- DB=postgresql
- DB_PORT=5432
- POSTGRES_USER=temporal
- POSTGRES_PWD=temporal
- POSTGRES_SEEDS=postgresql
- DYNAMIC_CONFIG_FILE_PATH=config/dynamicconfig/development_es.yaml
- ENABLE_ES=true
- ES_SEEDS=elasticsearch
- ES_VERSION=v7
- PROMETHEUS_ENDPOINT=0.0.0.0:8000
image: temporalio/auto-setup:1.14.0
image: temporalio/auto-setup:1.21.1
temporal-admin-tools:
depends_on:
- temporal
environment:
- TEMPORAL_ADDRESS=temporal:7233
- TEMPORAL_CLI_ADDRESS=temporal:7233
image: temporalio/admin-tools:1.14.0
image: temporalio/admin-tools:1.21.1
stdin_open: true
tty: true
temporal-web:
temporal-ui:
depends_on:
- temporal
environment:
- TEMPORAL_GRPC_ENDPOINT=temporal:7233
- TEMPORAL_PERMIT_WRITE_API=true
image: temporalio/web:1.13.0
- TEMPORAL_ADDRESS=temporal:7233
- TEMPORAL_CODEC_ENDPOINT=http://localhost:8081
image: temporalio/ui:2.16.2
ports:
- 8088:8088
- 8080:8080
prometheus:
image: prom/prometheus
ports:
Expand All @@ -69,7 +56,6 @@ services:
target: /etc/grafana/provisioning/datasources
mailhog:
image: mailhog/mailhog:v1.0.1
command: -invite-jim
ports:
- 8025:8025
thirdparty:
Expand All @@ -94,15 +80,17 @@ services:
- DATACONVERTER_ENCRYPTION_KEY_ID=secret
tools:
environment:
- TEMPORAL_ADDRESS=temporal:7233
- TEMPORAL_CLI_ADDRESS=temporal:7233
- TEMPORAL_CODEC_ENDPOINT=http://dataconverter:8081/
- TEMPORAL_CLI_CODEC_ENDPOINT=http://dataconverter:8081/
dataconverter:
build:
context: .
target: app
command: tctl dc web --web_ui_url http://localhost:8088
command: dataconverter-server --ui http://localhost:8080 --port 8081
restart: unless-stopped
ports:
- 8086:8086
- 8081:8081
environment:
- TEMPORAL_CLI_ADDRESS=temporal:7233
- TEMPORAL_CLI_DATA_CONVERTER_PORT=8086
- DATACONVERTER_ENCRYPTION_KEY_ID=secret
48 changes: 40 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,18 +1,50 @@
module github.com/temporalio/background-checks

go 1.16
go 1.20

require (
github.com/github/go-fault v0.2.0
github.com/gorilla/mux v1.8.0
github.com/hashicorp/go-plugin v1.4.3
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/client_golang v1.12.1
github.com/spf13/cobra v1.2.1
github.com/stretchr/testify v1.7.0
github.com/stretchr/testify v1.8.3
github.com/uber-go/tally/v4 v4.1.1
github.com/xhit/go-simple-mail/v2 v2.10.0
go.temporal.io/api v1.5.1-0.20211018190919-a5f4a169cd08
go.temporal.io/sdk v1.12.0
go.temporal.io/api v1.21.0
go.temporal.io/sdk v1.23.1
go.temporal.io/sdk/contrib/tally v0.1.0
go.temporal.io/server v1.13.1
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
github.com/gogo/googleapis v1.4.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/gogo/status v1.1.1 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/pborman/uuid v1.2.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/robfig/cron v1.2.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/twmb/murmur3 v1.1.6 // indirect
go.uber.org/atomic v1.9.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/genproto v0.0.0-20230525154841-bd750badd5c6 // indirect
google.golang.org/grpc v1.55.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

0 comments on commit 0425e40

Please sign in to comment.