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

Remove DOCKER_LOG in favor of LOG_TO_STDOUT #1380

Merged
merged 1 commit into from Oct 19, 2020
Merged

Conversation

kushagharahi
Copy link
Contributor

Context #1379

@pkishino
Copy link
Collaborator

Can you please rebase this to remove the other health check commit ?

@haugene
Copy link
Owner

haugene commented Oct 10, 2020

I think this might also be due to master being commits before dev. I'll create a PR that merges master into dev and the result of that is probably what @kushagharahi should rebase on top of. I think we can keep most of the changes from master but since one Dockerfile (for alpine) is removed on dev and we'll deprecate DOCKER_LOG the last fixups has to be done there.

@haugene haugene mentioned this pull request Oct 10, 2020
@kushagharahi kushagharahi changed the title Merge in lastest master & remove DOCKER_LOG in favor of LOG_TO_STDOUT Remove DOCKER_LOG in favor of LOG_TO_STDOUT Oct 10, 2020
@kushagharahi
Copy link
Contributor Author

ok @haugene and @pkishino I've rebased off of the latest dev

@@ -46,7 +46,7 @@ ENV OPENVPN_USERNAME=**None** \
WEBPROXY_PORT=8888 \
WEBPROXY_USERNAME= \
WEBPROXY_PASSWORD= \
DOCKER_LOG=false \
LOG_TO_STDOUT=false \
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/haugene/docker-transmission-openvpn/blob/master/Dockerfile#L140

I think this was removed in merge conflicts. Not a big deal, just wanted to point out it wasn't missed on the master branch.

@haugene
Copy link
Owner

haugene commented Oct 19, 2020

Looks good 👍 Thanks @kushagharahi

@haugene haugene merged commit e0eaa0e into haugene:dev Oct 19, 2020
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

Successfully merging this pull request may close these issues.

None yet

3 participants