diff --git a/Dockerfile.citus b/Dockerfile.citus index 900d63a5..24313c40 100644 --- a/Dockerfile.citus +++ b/Dockerfile.citus @@ -7,7 +7,7 @@ ARG PGDATA=$PGHOME/data ARG LC_ALL=C.UTF-8 ARG LANG=C.UTF-8 -FROM postgres:$PG_MAJOR as builder +FROM postgres:$PG_MAJOR AS builder ARG PGHOME ARG PGDATA diff --git a/docker-compose-citus.yml b/docker-compose-citus.yml index c18a52e2..ea279fac 100644 --- a/docker-compose-citus.yml +++ b/docker-compose-citus.yml @@ -8,16 +8,19 @@ # The cluster could be started as: # $ docker-compose -f docker-compose-citus.yml up -d # You can read more about it in the: -# https://github.com/patroni/patroni/blob/master/docker/README.md#citus-cluster -version: "2" +# https://github.com/zalando/patroni/blob/master/docker/README.md#citus-cluster +version: "3" networks: demo: services: etcd1: &etcd - image: ${PATRONI_TEST_IMAGE:-patroni-citus} + image: harbor.optimcloud.com/library/optim/patroni-citus:latest networks: [ demo ] + ports: + - 2379 + - 2380 environment: ETCD_LISTEN_PEER_URLS: http://0.0.0.0:2380 ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379 @@ -32,17 +35,23 @@ services: etcd2: <<: *etcd container_name: demo-etcd2 + ports: + - 2379 + - 2380 hostname: etcd2 command: etcd --name etcd2 --initial-advertise-peer-urls http://etcd2:2380 etcd3: <<: *etcd container_name: demo-etcd3 + ports: + - 2379 + - 2380 hostname: etcd3 command: etcd --name etcd3 --initial-advertise-peer-urls http://etcd3:2380 haproxy: - image: ${PATRONI_TEST_IMAGE:-patroni-citus} + image: harbor.optimcloud.com/library/optim/patroni-citus:latest networks: [ demo ] env_file: docker/patroni.env hostname: haproxy @@ -63,8 +72,10 @@ services: PGSSLROOTCERT: /etc/ssl/certs/ssl-cert-snakeoil.pem coord1: - image: ${PATRONI_TEST_IMAGE:-patroni-citus} + image: harbor.optimcloud.com/library/optim/patroni-citus:latest networks: [ demo ] + ports: + - "5432" env_file: docker/patroni.env hostname: coord1 container_name: demo-coord1 @@ -74,8 +85,10 @@ services: PATRONI_CITUS_GROUP: 0 coord2: - image: ${PATRONI_TEST_IMAGE:-patroni-citus} + image: harbor.optimcloud.com/library/optim/patroni-citus:latest networks: [ demo ] + ports: + - "5432" env_file: docker/patroni.env hostname: coord2 container_name: demo-coord2 @@ -84,8 +97,10 @@ services: PATRONI_NAME: coord2 coord3: - image: ${PATRONI_TEST_IMAGE:-patroni-citus} + image: harbor.optimcloud.com/library/optim/patroni-citus:latest networks: [ demo ] + ports: + - "5432" env_file: docker/patroni.env hostname: coord3 container_name: demo-coord3 @@ -95,8 +110,10 @@ services: work1-1: - image: ${PATRONI_TEST_IMAGE:-patroni-citus} + image: harbor.optimcloud.com/library/optim/patroni-citus:latest networks: [ demo ] + ports: + - "5432" env_file: docker/patroni.env hostname: work1-1 container_name: demo-work1-1 @@ -106,8 +123,10 @@ services: PATRONI_CITUS_GROUP: 1 work1-2: - image: ${PATRONI_TEST_IMAGE:-patroni-citus} + image: harbor.optimcloud.com/library/optim/patroni-citus:latest networks: [ demo ] + ports: + - "5432" env_file: docker/patroni.env hostname: work1-2 container_name: demo-work1-2 @@ -117,8 +136,10 @@ services: work2-1: - image: ${PATRONI_TEST_IMAGE:-patroni-citus} + image: harbor.optimcloud.com/library/optim/patroni-citus:latest networks: [ demo ] + ports: + - "5432" env_file: docker/patroni.env hostname: work2-1 container_name: demo-work2-1 @@ -128,8 +149,10 @@ services: PATRONI_CITUS_GROUP: 2 work2-2: - image: ${PATRONI_TEST_IMAGE:-patroni-citus} + image: harbor.optimcloud.com/library/optim/patroni-citus:latest networks: [ demo ] + ports: + - "5432" env_file: docker/patroni.env hostname: work2-2 container_name: demo-work2-2 diff --git a/kubernetes/citus_k8s.yaml b/kubernetes/citus_k8s.yaml index 8e5f22d7..6fa25403 100644 --- a/kubernetes/citus_k8s.yaml +++ b/kubernetes/citus_k8s.yaml @@ -59,7 +59,7 @@ spec: serviceAccountName: citusdemo containers: - name: *cluster_name - image: patroni-citus-k8s # docker build -f Dockerfile.citus -t patroni-citus-k8s . + image: harbor.optimcloud.com/library/optim/patroni-citus-k8s # docker build -f Dockerfile.citus -t patroni-citus-k8s . imagePullPolicy: IfNotPresent readinessProbe: httpGet: @@ -169,7 +169,7 @@ spec: serviceAccountName: citusdemo containers: - name: *cluster_name - image: patroni-citus-k8s # docker build -f Dockerfile.citus -t patroni-citus-k8s . + image: harbor.optimcloud.com/library/optim/patroni-citus-k8s # docker build -f Dockerfile.citus -t patroni-citus-k8s . imagePullPolicy: IfNotPresent readinessProbe: httpGet: @@ -279,7 +279,7 @@ spec: serviceAccountName: citusdemo containers: - name: *cluster_name - image: patroni-citus-k8s # docker build -f Dockerfile.citus -t patroni-citus-k8s . + image: harbor.optimcloud.com/library/optim/patroni-citus-k8s # docker build -f Dockerfile.citus -t patroni-citus-k8s . imagePullPolicy: IfNotPresent readinessProbe: httpGet: diff --git a/postgres0.yml b/postgres0.yml index 1546045c..fd4d3d79 100644 --- a/postgres0.yml +++ b/postgres0.yml @@ -68,7 +68,7 @@ bootstrap: #- host replication replicator 127.0.0.1/32 gss include_realm=0 #- host all all 0.0.0.0/0 gss include_realm=0 - host replication replicator 127.0.0.1/32 md5 - - host all all 0.0.0.0/0 md5 + - host all all 0.0.0.0/0 trust # - hostssl all all 0.0.0.0/0 md5 # use_slots: true parameters: diff --git a/postgres1.yml b/postgres1.yml index 751a9761..be73af96 100644 --- a/postgres1.yml +++ b/postgres1.yml @@ -62,7 +62,7 @@ bootstrap: #- host replication replicator 127.0.0.1/32 gss include_realm=0 #- host all all 0.0.0.0/0 gss include_realm=0 - host replication replicator 127.0.0.1/32 md5 - - host all all 0.0.0.0/0 md5 + - host all all 0.0.0.0/0 trust # - hostssl all all 0.0.0.0/0 md5 # use_slots: true parameters: diff --git a/postgres2.yml b/postgres2.yml index e64da525..da169a0f 100644 --- a/postgres2.yml +++ b/postgres2.yml @@ -62,7 +62,7 @@ bootstrap: #- host replication replicator 127.0.0.1/32 gss include_realm=0 #- host all all 0.0.0.0/0 gss include_realm=0 - host replication replicator 127.0.0.1/32 md5 - - host all all 0.0.0.0/0 md5 + - host all all 0.0.0.0/0 trust # - hostssl all all 0.0.0.0/0 md5 # use_slots: true parameters: