Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regulary merge origin docker-library/postgres #8

Open
mcd-php opened this issue Jul 27, 2017 · 3 comments
Open

Regulary merge origin docker-library/postgres #8

mcd-php opened this issue Jul 27, 2017 · 3 comments

Comments

@mcd-php
Copy link

mcd-php commented Jul 27, 2017

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.

@DanielDent
Copy link
Owner

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.

@mcd-php
Copy link
Author

mcd-php commented Jul 28, 2017

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.

@DanielDent
Copy link
Owner

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants