Skip to content

Added Dockerfile and docker-compose#161

Open
ghost wants to merge 2 commits into
magjac:masterfrom
b-a0:docker
Open

Added Dockerfile and docker-compose#161
ghost wants to merge 2 commits into
magjac:masterfrom
b-a0:docker

Conversation

@ghost

@ghost ghost commented Apr 23, 2021

Copy link
Copy Markdown

A very blunt Dockerfile and docker-compose to run this on a system without node.
I'm cloning the repository into the image instead of using COPY or ADD to prevent cross-platform line-endings hassle. There's probably a more elegant way.

@magjac

magjac commented Feb 7, 2022

Copy link
Copy Markdown
Owner

Thanks for the contribution and apologies for the delay. I'm willing to merge this if you can add why and how to use it to the README.

@ghost

ghost commented Feb 10, 2022

Copy link
Copy Markdown
Author

I've added a section in the README on how to use this. Regarding the why: installing make on Windows appeared to be a hassle, and I already had docker available. Hope it's helpful to future users!

P.S. Sorry about all the other commits, I thought I would update my fork first, but it appears this creates a whole new commit history in this pull request. Hope that's ok.

@magjac magjac left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Can you please rebase this on the current master and get rid of the surplus commits and the merge commit?

Comment thread docker-compose.yml Outdated
Comment thread docker/Dockerfile Outdated
Comment thread README.md Outdated
Comment thread docker/Dockerfile Outdated
@ghost ghost force-pushed the docker branch 4 times, most recently from 1fb30ad to e614c3e Compare February 24, 2022 00:40
@ghost ghost requested a review from magjac February 24, 2022 00:44
@ghost

ghost commented Feb 24, 2022

Copy link
Copy Markdown
Author

After a few rides on the git reset/rebase/force push merry go round I think I got rid of the extra commits and rebased it onto the magjac:master branch (I've set your master branch as upstream, created a local branch of it and rebased my docker branch onto that).
I've addressed the missing new lines and extra whitespace as well.

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