Skip to content

Commit

Permalink
Bump to couchdb:3.3.2 in tests and example configs
Browse files Browse the repository at this point in the history
  • Loading branch information
gesellix committed Jul 5, 2023
1 parent c728c5a commit 2f71075
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 12 deletions.
8 changes: 4 additions & 4 deletions examples/compose/docker-compose-cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "2.3"

services:
couchdb1:
image: couchdb:2.3.1
image: couchdb:3.3.2
command: -name [email protected] -setcookie thecookie
env_file: .couchdb-env
restart: always
Expand All @@ -13,7 +13,7 @@ services:
- "15984:5984"

couchdb2:
image: couchdb:2.3.1
image: couchdb:3.3.2
command: -name [email protected] -setcookie thecookie
env_file: .couchdb-env
restart: always
Expand All @@ -24,7 +24,7 @@ services:
- "25984:5984"

couchdb3:
image: couchdb:2.3.1
image: couchdb:3.3.2
command: -name [email protected] -setcookie thecookie
env_file: .couchdb-env
restart: always
Expand All @@ -45,7 +45,7 @@ services:
- "9984:9984"

cluster-setup:
image: gesellix/couchdb-cluster-config:v17.0.0
image: gesellix/couchdb-cluster-config:v17.2.8
command: -nodes 172.16.238.11 -nodes 172.16.238.12 -nodes 172.16.238.13
networks:
couchdb-cluster:
Expand Down
6 changes: 3 additions & 3 deletions examples/compose/docker-compose-integrationtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
- "4895:5984"

couchdb_node_1:
image: couchdb:3.3.1
image: couchdb:3.3.2
command: -setcookie thecookie
environment:
- "COUCHDB_USER=${COUCHDB_USER:-root}"
Expand All @@ -26,7 +26,7 @@ services:
- "15984:5984"

couchdb_node_2:
image: couchdb:3.3.1
image: couchdb:3.3.2
command: -setcookie thecookie
environment:
- "COUCHDB_USER=${COUCHDB_USER:-root}"
Expand All @@ -41,7 +41,7 @@ services:
- "25984:5984"

couchdb_node_3:
image: couchdb:3.3.1
image: couchdb:3.3.2
command: -setcookie thecookie
environment:
- "COUCHDB_USER=${COUCHDB_USER:-root}"
Expand Down
2 changes: 1 addition & 1 deletion examples/compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "2"

services:
couchdb:
image: couchdb:2.3.1
image: couchdb:3.3.2
env_file: .couchdb-env
restart: always
volumes:
Expand Down
20 changes: 16 additions & 4 deletions examples/grafana/docker-traefik-stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,12 @@ services:
condition: on-failure

couchdb1:
image: couchdb:2.3.1
image: couchdb:3.3.2
command: -name couchdb@couchdb1 -setcookie thecookie
environment:
- "COUCHDB_USER=${COUCHDB_USER:-root}"
- "COUCHDB_PASSWORD=${COUCHDB_PASSWORD:-a-secret}"
- "COUCHDB_SECRET=${COUCHDB_SECRET:-123456}"
networks:
couchdb-cluster:
monitor-net:
Expand All @@ -88,8 +92,12 @@ services:
condition: on-failure

couchdb2:
image: couchdb:2.3.1
image: couchdb:3.3.2
command: -name couchdb@couchdb2 -setcookie thecookie
environment:
- "COUCHDB_USER=${COUCHDB_USER:-root}"
- "COUCHDB_PASSWORD=${COUCHDB_PASSWORD:-a-secret}"
- "COUCHDB_SECRET=${COUCHDB_SECRET:-123456}"
networks:
couchdb-cluster:
monitor-net:
Expand All @@ -104,8 +112,12 @@ services:
condition: on-failure

couchdb3:
image: couchdb:2.3.1
image: couchdb:3.3.2
command: -name couchdb@couchdb3 -setcookie thecookie
environment:
- "COUCHDB_USER=${COUCHDB_USER:-root}"
- "COUCHDB_PASSWORD=${COUCHDB_PASSWORD:-a-secret}"
- "COUCHDB_SECRET=${COUCHDB_SECRET:-123456}"
networks:
couchdb-cluster:
monitor-net:
Expand Down Expand Up @@ -158,7 +170,7 @@ services:
condition: on-failure

cluster-setup:
image: gesellix/couchdb-cluster-config:v17.0.0
image: gesellix/couchdb-cluster-config:v17.2.8
command: setup --delay 10s --timeout 30s --username ${COUCHDB_USER:-root} --password ${COUCHDB_PASSWORD:-a-secret} -nodes couchdb1 -nodes couchdb2 -nodes couchdb3
networks:
couchdb-cluster:
Expand Down
2 changes: 2 additions & 0 deletions examples/stack/config.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# this file shouldn't be in VCS, but we keep it here for demo purposes
couchdb.username=root
couchdb.password=a-secret
couchdb.uri=http://foo.example.com
databases.views=false

0 comments on commit 2f71075

Please sign in to comment.