From 7947ac3738ffc430f236103157a166c6b8d77eb7 Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Thu, 19 Mar 2020 13:37:47 +0800 Subject: [PATCH 01/23] 9.6 --- .travis.yml | 6 ++++++ Dockerfile | 18 ++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..6460cdd --- /dev/null +++ b/.travis.yml @@ -0,0 +1,6 @@ +services: + - docker + +script: + - docker build -t jefftian/bucardo . + - echo $DOCKER_PASSWORD | docker push jefftian/bucardo diff --git a/Dockerfile b/Dockerfile index 64baca2..51b463d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,15 +3,25 @@ FROM ubuntu:xenial LABEL maintainer="lucas@vieira.io" LABEL version="1.0" +ENV PG_VERSION 9.6 + +RUN apt-get update \ + && apt-get -y install software-properties-common wget jq netcat + +RUN add-apt-repository \ + "deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main" + +RUN wget -q -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - + RUN apt-get -y update \ && apt-get -y upgrade -RUN apt-get -y install postgresql-9.5 bucardo jq +RUN apt-get -y install postgresql-${PG_VERSION} postgresql-plperl-${PG_VERSION} bucardo -COPY etc/pg_hba.conf /etc/postgresql/9.5/main/ +COPY etc/pg_hba.conf /etc/postgresql/${PG_VERSION}/main/ COPY etc/bucardorc /etc/bucardorc -RUN chown postgres /etc/postgresql/9.5/main/pg_hba.conf +RUN chown postgres /etc/postgresql/${PG_VERSION}/main/pg_hba.conf RUN chown postgres /etc/bucardorc RUN chown postgres /var/log/bucardo RUN mkdir /var/run/bucardo && chown postgres /var/run/bucardo @@ -24,4 +34,4 @@ COPY lib/entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh VOLUME "/media/bucardo" -CMD ["/bin/bash","-c","/entrypoint.sh"] +CMD ["/bin/bash","-c","/entrypoint.sh"] \ No newline at end of file From 616e68ab502f3364afb95f9e107ccd7522367f63 Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Thu, 19 Mar 2020 13:47:32 +0800 Subject: [PATCH 02/23] ci: docker login --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6460cdd..34979ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,10 @@ services: - docker +install: + - echo "$DOCKER_PASSWORD" | docker login -u jefftian --password-stdin + + script: - docker build -t jefftian/bucardo . - - echo $DOCKER_PASSWORD | docker push jefftian/bucardo + - docker push jefftian/bucardo From 6e551dc9f6a91561fcee897b6b6d0a300a4f73f7 Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Thu, 19 Mar 2020 15:44:54 +0800 Subject: [PATCH 03/23] upgrade version of postgresql --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 51b463d..638cdd1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:xenial LABEL maintainer="lucas@vieira.io" LABEL version="1.0" -ENV PG_VERSION 9.6 +ENV PG_VERSION 12.2 RUN apt-get update \ && apt-get -y install software-properties-common wget jq netcat From d824da9dd1a172e4eb5817eadaab2d96e8ca9941 Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Thu, 19 Mar 2020 18:35:12 +0800 Subject: [PATCH 04/23] version 12 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 638cdd1..2f96bbd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:xenial LABEL maintainer="lucas@vieira.io" LABEL version="1.0" -ENV PG_VERSION 12.2 +ENV PG_VERSION 12 RUN apt-get update \ && apt-get -y install software-properties-common wget jq netcat From be72d6ce977a03dbabe03464c80423ab338450e7 Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Thu, 19 Mar 2020 18:57:08 +0800 Subject: [PATCH 05/23] more logs --- lib/entrypoint.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/entrypoint.sh b/lib/entrypoint.sh index deab014..7963f46 100644 --- a/lib/entrypoint.sh +++ b/lib/entrypoint.sh @@ -50,6 +50,8 @@ validate_list_attr() { run_bucardo_command() { local comm=$1 + echo "command = " + echo $comm su - postgres -c "bucardo $comm" } @@ -158,10 +160,19 @@ add_syncs_to_bucardo() { db_sync_string $sync_index local one_time_copy="$(one_time_copy_attr $sync_index)" run_bucardo_command "del sync sync$sync_index" + echo "will adding ..." + echo "add sync sync$sync_index \ + dbs=$DB_STRING \ + tables=$(sync_attr $sync_index tables list) \ + onetimecopy=$one_time_copy" + run_bucardo_command "add sync sync$sync_index \ dbs=$DB_STRING \ tables=$(sync_attr $sync_index tables list) \ onetimecopy=$one_time_copy" + + echo "added" + sync_index=$(expr $sync_index + 1) done } From d99c03845c031021b783c8059176b13784add66a Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Fri, 20 Mar 2020 13:43:42 +0800 Subject: [PATCH 06/23] install latest bucardo from source --- Dockerfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Dockerfile b/Dockerfile index 2f96bbd..619abbf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,15 @@ RUN apt-get -y update \ RUN apt-get -y install postgresql-${PG_VERSION} postgresql-plperl-${PG_VERSION} bucardo +RUN apt-get -y install build-essential git +RUN git clone https://github.com/bucardo/bucardo +RUN cd bucardo +RUN perl Makefile.PL +RUN make +RUN make test +RUN make install +RUN cd - + COPY etc/pg_hba.conf /etc/postgresql/${PG_VERSION}/main/ COPY etc/bucardorc /etc/bucardorc From b2e63156ab780a105ff8108e66ec79a4ad0ce2a2 Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Fri, 20 Mar 2020 18:54:07 +0800 Subject: [PATCH 07/23] fix: RUN --- Dockerfile | 7 +------ build.bat | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) create mode 100644 build.bat diff --git a/Dockerfile b/Dockerfile index 619abbf..bb72660 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,12 +20,7 @@ RUN apt-get -y install postgresql-${PG_VERSION} postgresql-plperl-${PG_VERSION} RUN apt-get -y install build-essential git RUN git clone https://github.com/bucardo/bucardo -RUN cd bucardo -RUN perl Makefile.PL -RUN make -RUN make test -RUN make install -RUN cd - +RUN cd bucardo && perl Makefile.PL && make && make test && make install COPY etc/pg_hba.conf /etc/postgresql/${PG_VERSION}/main/ COPY etc/bucardorc /etc/bucardorc diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..336c3be --- /dev/null +++ b/build.bat @@ -0,0 +1 @@ +docker build -t jefftian/bucardo . \ No newline at end of file From c00d5e7d0e1c65c63a6f21e9eed647c44e629756 Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Fri, 20 Mar 2020 19:00:58 +0800 Subject: [PATCH 08/23] skip test --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bb72660..a4e5f86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN apt-get -y install postgresql-${PG_VERSION} postgresql-plperl-${PG_VERSION} RUN apt-get -y install build-essential git RUN git clone https://github.com/bucardo/bucardo -RUN cd bucardo && perl Makefile.PL && make && make test && make install +RUN cd bucardo && perl Makefile.PL && make && make install COPY etc/pg_hba.conf /etc/postgresql/${PG_VERSION}/main/ COPY etc/bucardorc /etc/bucardorc From 1cb55d718a7c97861d5253441ba45eab8138c0d3 Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Fri, 20 Mar 2020 23:31:02 +0800 Subject: [PATCH 09/23] install latest bucardo after the service started --- Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index a4e5f86..803f704 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,10 +18,6 @@ RUN apt-get -y update \ RUN apt-get -y install postgresql-${PG_VERSION} postgresql-plperl-${PG_VERSION} bucardo -RUN apt-get -y install build-essential git -RUN git clone https://github.com/bucardo/bucardo -RUN cd bucardo && perl Makefile.PL && make && make install - COPY etc/pg_hba.conf /etc/postgresql/${PG_VERSION}/main/ COPY etc/bucardorc /etc/bucardorc @@ -32,10 +28,16 @@ RUN mkdir /var/run/bucardo && chown postgres /var/run/bucardo RUN usermod -aG bucardo postgres RUN service postgresql start \ + && service postgresql status \ && su - postgres -c "bucardo install --batch" COPY lib/entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh + +RUN apt-get -y install build-essential git +RUN git clone https://github.com/bucardo/bucardo +RUN cd bucardo && perl Makefile.PL && make && make install + VOLUME "/media/bucardo" CMD ["/bin/bash","-c","/entrypoint.sh"] \ No newline at end of file From 77177fc05923b197eba197a8f3d9477cdb820fb4 Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Sun, 22 Mar 2020 11:21:12 +0800 Subject: [PATCH 10/23] fix: use user postgres for dbuser to fix the bucardo install no password provicded error --- Dockerfile | 14 +++++++------- etc/bucardorc | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 803f704..2d09d5f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,15 +16,20 @@ RUN wget -q -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key ad RUN apt-get -y update \ && apt-get -y upgrade -RUN apt-get -y install postgresql-${PG_VERSION} postgresql-plperl-${PG_VERSION} bucardo +RUN apt-get -y install postgresql-${PG_VERSION} postgresql-plperl-${PG_VERSION} libdbi-perl libpq-dev libdbd-pg-perl + +RUN apt-get -y install build-essential git +RUN git clone https://github.com/bucardo/bucardo +RUN cd bucardo && perl Makefile.PL && make && make install COPY etc/pg_hba.conf /etc/postgresql/${PG_VERSION}/main/ COPY etc/bucardorc /etc/bucardorc RUN chown postgres /etc/postgresql/${PG_VERSION}/main/pg_hba.conf RUN chown postgres /etc/bucardorc -RUN chown postgres /var/log/bucardo +# RUN chown postgres /var/log/bucardo RUN mkdir /var/run/bucardo && chown postgres /var/run/bucardo +RUN groupadd bucardo RUN usermod -aG bucardo postgres RUN service postgresql start \ @@ -34,10 +39,5 @@ RUN service postgresql start \ COPY lib/entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh - -RUN apt-get -y install build-essential git -RUN git clone https://github.com/bucardo/bucardo -RUN cd bucardo && perl Makefile.PL && make && make install - VOLUME "/media/bucardo" CMD ["/bin/bash","-c","/entrypoint.sh"] \ No newline at end of file diff --git a/etc/bucardorc b/etc/bucardorc index 1829168..c8b9fa9 100644 --- a/etc/bucardorc +++ b/etc/bucardorc @@ -1,3 +1,3 @@ dbport = 5432 -dbuser = bucardo -dbname = bucardo +dbuser = postgres +dbname = bucardo \ No newline at end of file From c9e7edc8b1ccc5967c06d7beb785247f763376b7 Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Sun, 22 Mar 2020 16:31:47 +0800 Subject: [PATCH 11/23] fix: install libdbix-safe-perl --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2d09d5f..c37ada7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN wget -q -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key ad RUN apt-get -y update \ && apt-get -y upgrade -RUN apt-get -y install postgresql-${PG_VERSION} postgresql-plperl-${PG_VERSION} libdbi-perl libpq-dev libdbd-pg-perl +RUN apt-get -y install postgresql-${PG_VERSION} postgresql-plperl-${PG_VERSION} libdbi-perl libpq-dev libdbd-pg-perl libdbix-safe-perl RUN apt-get -y install build-essential git RUN git clone https://github.com/bucardo/bucardo From f0d3b0a8e5fb820304c2f7dd2f8090e829da4e90 Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Sun, 22 Mar 2020 17:33:54 +0800 Subject: [PATCH 12/23] fix: log issue --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c37ada7..9dee1b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,9 @@ COPY etc/bucardorc /etc/bucardorc RUN chown postgres /etc/postgresql/${PG_VERSION}/main/pg_hba.conf RUN chown postgres /etc/bucardorc -# RUN chown postgres /var/log/bucardo +RUN mkdir -p /var/log/bucardo +RUN touch /var/log/bucardo/log.bucardo +RUN chown postgres /var/log/bucardo RUN mkdir /var/run/bucardo && chown postgres /var/run/bucardo RUN groupadd bucardo RUN usermod -aG bucardo postgres From 3cc1a604b33701f85a4f6ea1d3129e6c12ebf893 Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Sun, 22 Mar 2020 19:19:27 +0800 Subject: [PATCH 13/23] fix: conflict strategy = latest --- lib/entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/entrypoint.sh b/lib/entrypoint.sh index 7963f46..026121c 100644 --- a/lib/entrypoint.sh +++ b/lib/entrypoint.sh @@ -164,12 +164,12 @@ add_syncs_to_bucardo() { echo "add sync sync$sync_index \ dbs=$DB_STRING \ tables=$(sync_attr $sync_index tables list) \ - onetimecopy=$one_time_copy" + onetimecopy=$one_time_copy conflict_strategy=latest" run_bucardo_command "add sync sync$sync_index \ dbs=$DB_STRING \ tables=$(sync_attr $sync_index tables list) \ - onetimecopy=$one_time_copy" + onetimecopy=$one_time_copy conflict_strategy=latest" echo "added" From 1b35e0cce2d16ac50dc7666964c37c0a2b164db8 Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Mon, 23 Mar 2020 13:20:50 +0800 Subject: [PATCH 14/23] chown --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9dee1b5..dff3928 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ RUN chown postgres /etc/postgresql/${PG_VERSION}/main/pg_hba.conf RUN chown postgres /etc/bucardorc RUN mkdir -p /var/log/bucardo RUN touch /var/log/bucardo/log.bucardo -RUN chown postgres /var/log/bucardo +RUN chown postgres /var/log/bucardo/log.bucardo RUN mkdir /var/run/bucardo && chown postgres /var/run/bucardo RUN groupadd bucardo RUN usermod -aG bucardo postgres From 73d8e4e0673180c8cb448f0a7c28616548df5b2f Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Mon, 23 Mar 2020 17:14:34 +0800 Subject: [PATCH 15/23] start bucardo with --verbose --- lib/entrypoint.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/entrypoint.sh b/lib/entrypoint.sh index 026121c..e9676ae 100644 --- a/lib/entrypoint.sh +++ b/lib/entrypoint.sh @@ -50,8 +50,6 @@ validate_list_attr() { run_bucardo_command() { local comm=$1 - echo "command = " - echo $comm su - postgres -c "bucardo $comm" } @@ -179,7 +177,7 @@ add_syncs_to_bucardo() { start_bucardo() { echo "[CONTAINER] Starting Bucardo..." - run_bucardo_command "start" + run_bucardo_command "start --verbose" } bucardo_status() { From 1383294e610d15bd98cdc0125f1cf551d9b0cbb9 Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Mon, 23 Mar 2020 18:04:21 +0800 Subject: [PATCH 16/23] recover user bucardo --- etc/bucardorc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/bucardorc b/etc/bucardorc index c8b9fa9..a620ffd 100644 --- a/etc/bucardorc +++ b/etc/bucardorc @@ -1,3 +1,3 @@ dbport = 5432 -dbuser = postgres +dbuser = bucardo dbname = bucardo \ No newline at end of file From 65d57f68f9e201649f6250236c0389890a96be20 Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Mon, 23 Mar 2020 19:11:51 +0800 Subject: [PATCH 17/23] trust all local users --- etc/bucardorc | 2 +- etc/pg_hba.conf | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/etc/bucardorc b/etc/bucardorc index a620ffd..c8b9fa9 100644 --- a/etc/bucardorc +++ b/etc/bucardorc @@ -1,3 +1,3 @@ dbport = 5432 -dbuser = bucardo +dbuser = postgres dbname = bucardo \ No newline at end of file diff --git a/etc/pg_hba.conf b/etc/pg_hba.conf index d3e4e9d..6d5c7b5 100644 --- a/etc/pg_hba.conf +++ b/etc/pg_hba.conf @@ -3,3 +3,7 @@ local bucardo bucardo md5 local all all peer host all all 127.0.0.1/32 md5 host all all ::1/128 md5 + +local all all trust +host all all 127.0.0.1/32 trust +host all all ::1/128 trust From feca4fc49f64241f031ed81baa8afe52d40adead Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Mon, 23 Mar 2020 23:49:19 +0800 Subject: [PATCH 18/23] set log level to debug --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dff3928..e23414d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,8 @@ RUN usermod -aG bucardo postgres RUN service postgresql start \ && service postgresql status \ - && su - postgres -c "bucardo install --batch" + && su - postgres -c "bucardo install --batch" \ + && su - postgres -c "./bucardo set log_level=debug" COPY lib/entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh From 675c2ca694002eb940dc3911d970f735e814062e Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Mon, 23 Mar 2020 23:50:47 +0800 Subject: [PATCH 19/23] fix: typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e23414d..70d81a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ RUN usermod -aG bucardo postgres RUN service postgresql start \ && service postgresql status \ && su - postgres -c "bucardo install --batch" \ - && su - postgres -c "./bucardo set log_level=debug" + && su - postgres -c "bucardo set log_level=debug" COPY lib/entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh From 3733723da829f133351d832c7391d143bb09ca4e Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Tue, 24 Mar 2020 10:59:20 +0800 Subject: [PATCH 20/23] etc/bucardorc2 --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 70d81a8..56f0515 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,8 +36,10 @@ RUN usermod -aG bucardo postgres RUN service postgresql start \ && service postgresql status \ - && su - postgres -c "bucardo install --batch" \ - && su - postgres -c "bucardo set log_level=debug" + && su - postgres -c "bucardo install --batch && bucardo set log_level=debug" + +COPY etc/bucardorc2 /etc/bucardorc +RUN chown postgres /etc/bucardorc COPY lib/entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh From 8e690c21637b6fc74553c9c656a3e1983e800a78 Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Tue, 24 Mar 2020 10:59:27 +0800 Subject: [PATCH 21/23] etc/bucardorc2 --- etc/bucardorc2 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 etc/bucardorc2 diff --git a/etc/bucardorc2 b/etc/bucardorc2 new file mode 100644 index 0000000..a620ffd --- /dev/null +++ b/etc/bucardorc2 @@ -0,0 +1,3 @@ +dbport = 5432 +dbuser = bucardo +dbname = bucardo \ No newline at end of file From c55702e44c826278261470d6ca3f47e904d892db Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Wed, 25 Mar 2020 00:39:06 +0800 Subject: [PATCH 22/23] gitattributes --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..526c8a3 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.sh text eol=lf \ No newline at end of file From bb31e58581b9ec9cf203afb13e4b3742668a8f0b Mon Sep 17 00:00:00 2001 From: Jeff Tian Date: Thu, 30 Apr 2020 10:07:16 +0800 Subject: [PATCH 23/23] add vim --- .gitignore | 1 + Dockerfile | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a9a5aec..27b8322 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ tmp +.idea diff --git a/Dockerfile b/Dockerfile index 56f0515..8f6986b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,8 @@ RUN apt-get -y install build-essential git RUN git clone https://github.com/bucardo/bucardo RUN cd bucardo && perl Makefile.PL && make && make install +RUN apt-get -y install vim + COPY etc/pg_hba.conf /etc/postgresql/${PG_VERSION}/main/ COPY etc/bucardorc /etc/bucardorc @@ -45,4 +47,4 @@ COPY lib/entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh VOLUME "/media/bucardo" -CMD ["/bin/bash","-c","/entrypoint.sh"] \ No newline at end of file +CMD ["/bin/bash","-c","/entrypoint.sh"]