Skip to content

Commit 69996b6

Browse files
authored
fix(build): docker compose environments (#6099)
Fixed cortex dockerfile and updated consul docker image tag so that docker compose is able to successfully pull consul and swift images. Removed invalid enable_alertmanager_v2 cortex config param from microservice mode config files to fix cortex start up. cleanup: removed 'version' compose tag to silence deprecation warning Signed-off-by: Doupamo Eradiri <[email protected]>
1 parent e68ad87 commit 69996b6

File tree

8 files changed

+7
-10
lines changed

8 files changed

+7
-10
lines changed

development/tsdb-blocks-storage-s3-gossip/config/cortex.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ ruler:
9090
store: memberlist
9191

9292
alertmanager_url: http://alertmanager:8010/alertmanager
93-
enable_alertmanager_v2: false
9493

9594
ruler_storage:
9695
backend: s3

development/tsdb-blocks-storage-s3-gossip/dev.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM golang:1.19
22
ENV CGO_ENABLED=0
3-
RUN go get github.com/go-delve/delve/cmd/dlv
3+
RUN go install github.com/go-delve/delve/cmd/dlv@latest
44

55
FROM alpine:3.18
66

development/tsdb-blocks-storage-s3-gossip/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3.4'
22
services:
33

44
consul:
5-
image: consul
5+
image: consul:1.15.4
66
command: [ "agent", "-dev" ,"-client=0.0.0.0", "-log-level=info" ]
77
ports:
88
- 8500:8500

development/tsdb-blocks-storage-s3-single-binary/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3.4'
22
services:
33

44
consul:
5-
image: consul
5+
image: consul:1.15.4
66
command: [ "agent", "-dev" ,"-client=0.0.0.0", "-log-level=info" ]
77
ports:
88
- 8500:8500

development/tsdb-blocks-storage-s3/config/cortex.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ ruler:
8080
host: consul:8500
8181

8282
alertmanager_url: http://alertmanager-1:8031/alertmanager,http://alertmanager-2:8032/alertmanager,http://alertmanager-3:8033/alertmanager
83-
enable_alertmanager_v2: false
8483

8584
ruler_storage:
8685
backend: s3

development/tsdb-blocks-storage-s3/dev.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM golang:1.19
22
ENV CGO_ENABLED=0
3-
RUN go get github.com/go-delve/delve/cmd/dlv
3+
RUN go install github.com/go-delve/delve/cmd/dlv@latest
44

55
FROM alpine:3.19
66

development/tsdb-blocks-storage-s3/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3.4'
22
services:
33

44
consul:
5-
image: consul
5+
image: consul:1.15.4
66
command: [ "agent", "-dev" ,"-client=0.0.0.0", "-log-level=info" ]
77
ports:
88
- 8500:8500

development/tsdb-blocks-storage-swift-single-binary/docker-compose.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
version: '3.4'
21
services:
32

43
consul:
5-
image: consul
4+
image: consul:1.15.4
65
command: [ "agent", "-dev" ,"-client=0.0.0.0", "-log-level=info" ]
76
ports:
87
- 8500:8500
98

109
swift:
11-
image: beaukode/docker-swift-onlyone-authv2-keystone
10+
image: beaukode/docker-swift-onlyone-authv2-keystone:latest
1211
volumes:
1312
- .data-swift:/srv:delegated
1413
ports:

0 commit comments

Comments
 (0)