Dev docker images improvements (#2677)

- configurable image
- ETCD_UNSUPPORTED_ARCH env in docker-compose
- Build confd and citus for arm64 images
This commit is contained in:
Polina Bungina
2023-05-15 11:40:35 +02:00
committed by GitHub
parent 66a0e44371
commit 44e58a1ba1
4 changed files with 62 additions and 23 deletions
+6 -5
View File
@@ -14,7 +14,7 @@ networks:
services:
etcd1: &etcd
image: patroni
image: ${PATRONI_TEST_IMAGE:-patroni}
networks: [ demo ]
environment:
ETCD_LISTEN_PEER_URLS: http://0.0.0.0:2380
@@ -22,6 +22,7 @@ services:
ETCD_INITIAL_CLUSTER: etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380
ETCD_INITIAL_CLUSTER_STATE: new
ETCD_INITIAL_CLUSTER_TOKEN: tutorial
ETCD_UNSUPPORTED_ARCH: arm64
container_name: demo-etcd1
hostname: etcd1
command: etcd -name etcd1 -initial-advertise-peer-urls http://etcd1:2380
@@ -39,7 +40,7 @@ services:
command: etcd -name etcd3 -initial-advertise-peer-urls http://etcd3:2380
haproxy:
image: patroni
image: ${PATRONI_TEST_IMAGE:-patroni}
networks: [ demo ]
env_file: docker/patroni.env
hostname: haproxy
@@ -54,7 +55,7 @@ services:
PATRONI_SCOPE: demo
patroni1:
image: patroni
image: ${PATRONI_TEST_IMAGE:-patroni}
networks: [ demo ]
env_file: docker/patroni.env
hostname: patroni1
@@ -64,7 +65,7 @@ services:
PATRONI_NAME: patroni1
patroni2:
image: patroni
image: ${PATRONI_TEST_IMAGE:-patroni}
networks: [ demo ]
env_file: docker/patroni.env
hostname: patroni2
@@ -74,7 +75,7 @@ services:
PATRONI_NAME: patroni2
patroni3:
image: patroni
image: ${PATRONI_TEST_IMAGE:-patroni}
networks: [ demo ]
env_file: docker/patroni.env
hostname: patroni3