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 #498

Merged
merged 6 commits into from
Dec 14, 2019
Merged

Docker #498

merged 6 commits into from
Dec 14, 2019

Conversation

Throne3d
Copy link
Collaborator

@Throne3d Throne3d commented Aug 1, 2019

After I accidentally pushed to this repository instead of my own, the merge PR for #421's Docker support got automatically closed. I'm also not totally sure how to preserve the old commit history, in light of these all now … being … part of the main branch's … commit history. (A simple rebase didn't seem to work.) Oops. Anyway, you should be able to see that PR for more details.

@ekmartin Sorry about the messy commit history. Does this look okay? Would you be happy to add a Docker Hub image for this, and put the credentials into Travis?

@Throne3d Throne3d requested a review from ekmartin August 1, 2019 15:53
@Throne3d Throne3d mentioned this pull request Aug 1, 2019
@coveralls
Copy link

coveralls commented Aug 1, 2019

Coverage Status

Coverage remained the same at 97.207% when pulling 5abc4fa on Throne3d:docker-test into 5d31e2d on reactiflux:master.

@gdude2002
Copy link
Contributor

Don't worry about attribution, I'm just happy to get this in, haha

@gdude2002
Copy link
Contributor

Looks like you've got yourself a merge conflict!

@Throne3d
Copy link
Collaborator Author

Throne3d commented Aug 5, 2019

Fixed, and updated it to use Node 12! Plus I made it actually skip the deploy phase on PRs (when it tests that it merges with master), instead of just on branch pushes.

@Throne3d
Copy link
Collaborator Author

Throne3d commented Aug 5, 2019

I've merged this on my fork, for testing, and had it push to https://hub.docker.com/r/throne3d/discord-irc – looks to be working! Reminder before merging: this PR requires the DOCKER_USERNAME and DOCKER_PASSWORD environment variables to be set, per https://docs.travis-ci.com/user/environment-variables/#defining-variables-in-repository-settings (probably on the master branch only, and definitely don't display the password in the build log).

@Throne3d
Copy link
Collaborator Author

This now uses the https://hub.docker.com/r/discordirc/discord-irc repository! I did a test build locally, which seemed to work fine, so now it's just to see if this works on master.

@Throne3d Throne3d merged commit 11a5347 into reactiflux:master Dec 14, 2019
@Throne3d Throne3d deleted the docker-test branch December 14, 2019 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants