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

Docker #14

Merged
merged 82 commits into from
Mar 27, 2018
Merged

Docker #14

merged 82 commits into from
Mar 27, 2018

Conversation

sphen13
Copy link
Contributor

@sphen13 sphen13 commented Mar 9, 2018

OK - went through some last changes as we discussed. Just reviewed all the changes - I think this is all good - but please review to make sure I didnt miss anything.

My hope is this is a good staring point and I can make the docker container more mature as time goes on.

should be good to start testing - needs some work.
# Conflicts:
#	Server/server-config.sh
when running in docker it will reset the collector mysql password each
time the container initializes.
add docker volumes for ssh key locations.
Will generate a new macOS install .pkg file in the /tmp/pkg directory
when running client-config.sh within Docker
Fixed sql server in collector.php and move README.
every docker container had the same host key as it was baked in - this
resolves and allows you to map the correct keys
Add BlueSky Admin tool auto-generation within docker container.
same fix as potential PR #9
# Conflicts:
#	Admin Tools/setup.applescript
also some README example path changes
resolve conflict with
logicnow@23e21a11ba44db78589066af46a60
787fbba0df0 - we both tried to do the same thing.
# Conflicts:
#	Server/server-config.sh
sphen13 and others added 14 commits December 22, 2017 11:43
# Conflicts:
#	Admin Tools/BlueSky Admin.app/Contents/Info.plist
#	Admin Tools/Info.plist
#	Admin Tools/connect/Info.plist
#	Admin Tools/connect/connect.applescript
#	Admin Tools/temporary client/temporary client.applescript
was reverting back to http on some requests.
add version variable, make mods to exclude admin tool raw scripts
Change SSL cert workflow. Update README. Small apache error fix
Wait for MySQL database to start
sphen13 and others added 8 commits March 9, 2018 09:50
Better handling of installing over older (pre 2.0) bluesky.  Also do a
better job making sure the bluesky home permissions are correct.

Spacing normalization
Bux fixes
- bad mysql admin password logic in docker/run
- helper.sh improvements when updating from pre 2.0 bluesky
- fix webadmin password being reset on each container run
@sphen13
Copy link
Contributor Author

sphen13 commented Mar 21, 2018

Just updated with some bugs that @kginger and I found. Please test against the latest here.

Copy link
Contributor

@bestmacs bestmacs left a comment

Choose a reason for hiding this comment

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

You can ignore two of the three comments (one negates the other). I saw where someone can upload their own pem file for server certificates, but weren't you doing something with Let's Encrypt? (Or did I miss it?)

@@ -29,6 +29,12 @@ smtpServer=""
smtpAuth=""
smtpPass=""

if [[ ${IN_DOCKER} && ${SMTP_SERVER} && ${SMTP_AUTH} && ${SMTP_PASS} ]]; then
smtpServer=$SMTP_SERVER
Copy link
Contributor

Choose a reason for hiding this comment

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

Walking through the docker setup in the readme, I did not see where to provide these.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

assume this is one of the comments you figured out later - in the docker/README.md (https://github.com/logicnow/BlueSky/pull/14/files#diff-a489144702a723431811d56a3c44690a) it lists these 3 SMTP ENV variables :)

filter = apache-phpmyadmin
logpath = /var/log/apache*/*error.log
maxretry = 3
#[apache-phpmyadmin]
Copy link
Contributor

Choose a reason for hiding this comment

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

Why comment these out?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

you are correct - i dont need to comment out - i may have gotten a bit over zealous. it just assumes that the user is using phpmyadmin which they may not (not part of the bluesky setup or instructions). i can uncomment in this PR and get this jail back to what it was.

> **Note:** _We do not care about SSL certs here as the Caddy container will take care of that_

```
docker run -d --name bluesky \
Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, here they are. I missed these on the first trial run.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes so in this first pass (i can do more in the future) i just focussed on adapting what you did for docker. that includes not really worrying about SSL much (no auto LetsEncrypt). I decided in the "full setup" example to walk the user through creating a caddy container which would provide SSL automatically for the bluesky container. in the case that the user did not want to do this and wanted to use their own certs i have a way to pass the cert and private key to the container which is have tested and works.

@sphen13
Copy link
Contributor Author

sphen13 commented Mar 23, 2018

undid the jail.local comment block - not only necessary changes have been made

@bestmacs bestmacs merged commit 2736cd4 into logicnow:master Mar 27, 2018
@sphen13
Copy link
Contributor Author

sphen13 commented Mar 27, 2018

woah

@sphen13 sphen13 deleted the docker branch March 28, 2018 00:57
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