docker-postgres-replication icon indicating copy to clipboard operation
docker-postgres-replication copied to clipboard

Regulary merge origin docker-library/postgres

Open mcd-php opened this issue 7 years ago • 3 comments

I had to copy-paste file_env() for shared secrets, and there are some more changes for overall progress.

Also, what is the original version of docker-entrypoint.sh you started from ? I could try to merge automatically, but it's impossible without complete tree and it's root.

mcd-php avatar Jul 27 '17 12:07 mcd-php

The upstream branch is how I do automatic merges using Git merge commits. I'd be pleased to merge a PR that got things up to date by following the convention - basically, commit the unmodified docker-entrypoint.sh on the upstream branch, then do a git merge.

DanielDent avatar Jul 27 '17 13:07 DanielDent

The version you started editing is most likely 2a952743...:docker-entrypoint.sh, it has minimum diff line count.

I now have your alleged un-tracked initial diff, but that's not relevant, because:

I tried to construct proper tree, but was overwhelmed by conflicts. Then I took latest verbatim upstream and re-planted your IF blocks upon that, until my stack started without error messages.

mcd-php avatar Jul 28 '17 10:07 mcd-php

I've created a new patch based build process on the dev branch, and builds from this process temporarily live at https://hub.docker.com/r/danieldent/docker-postgres-replication-dev/ until I and other community members have had a chance to test these updates (the new build process also builds the -alpine variants as well as Postgres 10). I have not had time to even run these new builds, so please run this builds in test prior to dropping them into a production environment.

DanielDent avatar Mar 19 '18 06:03 DanielDent