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

Control PIA and Transmission from env vars #10

Merged
merged 1 commit into from
May 10, 2015
Merged

Conversation

ianneub
Copy link
Contributor

@ianneub ianneub commented May 9, 2015

Also reducing size of Docker image.

@ianneub ianneub changed the title Adding env vars to PIA and Transmission config WIP: Adding env vars to PIA and Transmission config May 9, 2015
@ianneub ianneub changed the title WIP: Adding env vars to PIA and Transmission config Adding env vars to PIA and Transmission config May 9, 2015
@ianneub
Copy link
Contributor Author

ianneub commented May 9, 2015

Ok I think this is ready to go now. Phew, sorry for all the clutter. I messed up the rebase/merging. But everything should be good now, and it's all condensed into one commit 👍

@ianneub ianneub changed the title Adding env vars to PIA and Transmission config Control PIA and Transmission from env vars May 9, 2015
@ianneub ianneub force-pushed the dev branch 2 times, most recently from bbe57d0 to 76935c0 Compare May 9, 2015 20:09
Added transmission settings to env vars. Fixed haugene#8.
Updated readme.
Added ability to override /etc/resolv.conf. Fixes haugene#4.
Save docker image size by combining all apt commands into a single RUN statement.
echo $PIA_USERNAME > /config/pia-credentials.txt
echo $PIA_PASSWORD >> /config/pia-credentials.txt
else
echo "Not setting PIA credentials."
Copy link
Owner

Choose a reason for hiding this comment

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

Should probably not allow startup without credentials. Thinking exit here...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

👍

Copy link
Owner

Choose a reason for hiding this comment

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

Fixed in faa3972

@haugene
Copy link
Owner

haugene commented May 10, 2015

Left some notes, I'm gonna do a little refactor. But good, merging now!

haugene added a commit that referenced this pull request May 10, 2015
Control PIA and Transmission from env vars
@haugene haugene merged commit 0e53814 into haugene:dev May 10, 2015
@@ -36,9 +28,81 @@ ADD transmission/runUpdates.sh /etc/transmission-daemon/startPortUpdates.sh
ADD transmission/down.sh /etc/transmission-daemon/stop.sh
ADD runOpenVpn.sh /etc/openvpn/start.sh

ENV PIA_USERNAME=**None** \
PIA_PASSWORD=**None** \
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I also set these to a default bogus value. You can remove these as well if you'd like.

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.

2 participants