diff --git a/development/tsdb-blocks-storage-s3-gossip/config/cortex.yaml b/development/tsdb-blocks-storage-s3-gossip/config/cortex.yaml index bc79dabb8c..47a5140406 100644 --- a/development/tsdb-blocks-storage-s3-gossip/config/cortex.yaml +++ b/development/tsdb-blocks-storage-s3-gossip/config/cortex.yaml @@ -90,7 +90,6 @@ ruler: store: memberlist alertmanager_url: http://alertmanager:8010/alertmanager - enable_alertmanager_v2: false ruler_storage: backend: s3 diff --git a/development/tsdb-blocks-storage-s3-gossip/dev.dockerfile b/development/tsdb-blocks-storage-s3-gossip/dev.dockerfile index f05d0c667e..acc34126d3 100644 --- a/development/tsdb-blocks-storage-s3-gossip/dev.dockerfile +++ b/development/tsdb-blocks-storage-s3-gossip/dev.dockerfile @@ -1,6 +1,6 @@ FROM golang:1.19 ENV CGO_ENABLED=0 -RUN go get github.com/go-delve/delve/cmd/dlv +RUN go install github.com/go-delve/delve/cmd/dlv@latest FROM alpine:3.18 diff --git a/development/tsdb-blocks-storage-s3-gossip/docker-compose.yml b/development/tsdb-blocks-storage-s3-gossip/docker-compose.yml index bfc5fbf7fb..455a3e1f7a 100644 --- a/development/tsdb-blocks-storage-s3-gossip/docker-compose.yml +++ b/development/tsdb-blocks-storage-s3-gossip/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.4' services: consul: - image: consul + image: consul:1.15.4 command: [ "agent", "-dev" ,"-client=0.0.0.0", "-log-level=info" ] ports: - 8500:8500 diff --git a/development/tsdb-blocks-storage-s3-single-binary/docker-compose.yml b/development/tsdb-blocks-storage-s3-single-binary/docker-compose.yml index f65fb0feda..4e6b396d19 100644 --- a/development/tsdb-blocks-storage-s3-single-binary/docker-compose.yml +++ b/development/tsdb-blocks-storage-s3-single-binary/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.4' services: consul: - image: consul + image: consul:1.15.4 command: [ "agent", "-dev" ,"-client=0.0.0.0", "-log-level=info" ] ports: - 8500:8500 diff --git a/development/tsdb-blocks-storage-s3/config/cortex.yaml b/development/tsdb-blocks-storage-s3/config/cortex.yaml index 0f35136841..32da3d72f1 100644 --- a/development/tsdb-blocks-storage-s3/config/cortex.yaml +++ b/development/tsdb-blocks-storage-s3/config/cortex.yaml @@ -80,7 +80,6 @@ ruler: host: consul:8500 alertmanager_url: http://alertmanager-1:8031/alertmanager,http://alertmanager-2:8032/alertmanager,http://alertmanager-3:8033/alertmanager - enable_alertmanager_v2: false ruler_storage: backend: s3 diff --git a/development/tsdb-blocks-storage-s3/dev.dockerfile b/development/tsdb-blocks-storage-s3/dev.dockerfile index 698ed36ea2..4566c8dafb 100644 --- a/development/tsdb-blocks-storage-s3/dev.dockerfile +++ b/development/tsdb-blocks-storage-s3/dev.dockerfile @@ -1,6 +1,6 @@ FROM golang:1.19 ENV CGO_ENABLED=0 -RUN go get github.com/go-delve/delve/cmd/dlv +RUN go install github.com/go-delve/delve/cmd/dlv@latest FROM alpine:3.19 diff --git a/development/tsdb-blocks-storage-s3/docker-compose.yml b/development/tsdb-blocks-storage-s3/docker-compose.yml index 7985479c6f..5bb3a9d370 100644 --- a/development/tsdb-blocks-storage-s3/docker-compose.yml +++ b/development/tsdb-blocks-storage-s3/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.4' services: consul: - image: consul + image: consul:1.15.4 command: [ "agent", "-dev" ,"-client=0.0.0.0", "-log-level=info" ] ports: - 8500:8500 diff --git a/development/tsdb-blocks-storage-swift-single-binary/docker-compose.yml b/development/tsdb-blocks-storage-swift-single-binary/docker-compose.yml index ef280142f6..c9a57460f3 100644 --- a/development/tsdb-blocks-storage-swift-single-binary/docker-compose.yml +++ b/development/tsdb-blocks-storage-swift-single-binary/docker-compose.yml @@ -1,14 +1,13 @@ -version: '3.4' services: consul: - image: consul + image: consul:1.15.4 command: [ "agent", "-dev" ,"-client=0.0.0.0", "-log-level=info" ] ports: - 8500:8500 swift: - image: beaukode/docker-swift-onlyone-authv2-keystone + image: beaukode/docker-swift-onlyone-authv2-keystone:latest volumes: - .data-swift:/srv:delegated ports: