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.

Sign up for GitHub

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

Jump to bottom

Make docker work #17

Merged
merged 8 commits into from
Sep 1, 2020
Merged

Make docker work #17

merged 8 commits into from
Sep 1, 2020

Conversation

kohnech
Copy link
Contributor

@kohnech kohnech commented Jun 24, 2020 •
edited
Loading

Some changes to make it work for me on Windows 10 and TeamCity:

  • Fix docker-compose up work with bundle on Windows
  • Update using docker compose version 3
  • Use naming convention for docker images
  • Add TeamCity authentication

Review Comments fixes:

  • Add support for both guest and password authentication to teamcity server
  • Change TC... variables to TEAM_CITY...
  • Change /tmp folder inside docker container to /build-window

kohnech added 5 commits June 24, 2020 21:22
@kohnech
Fix issue running docker-compose up on Windows
5ff65dc 
-Running on Windows doesnt work for example:
"You must use Bundler 2 or greater with this lockfile".

-Only copy necessary Gemfiles (only used when building docker image). The rest can be mounted.
@kohnech
Follow docker compose standard
21a0ef7 
- Use docker compose version 3 (latest)
- Add services (good practise)
@kohnech
Correct image name
23f1e4d 
- Image name "build-window_build-window:latest" is very confusing. The naming convention is repository/image-name:tag. Using rouanw/build-window:latest following convention.
@kohnech
Add TC authentication
a6141e6 
- Only guest account works with TeamCity. For enterprise an authentication is most often required hence adding this.
@kohnech
Update README
84bea8a 
- Update README with authentication for TeamCity
rouanw
rouanw reviewed Jul 28, 2020
View reviewed changes
Copy link
Owner

@rouanw rouanw left a comment

Choose a reason for hiding this comment

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

Thanks for the PR @kohnech!

I added some questions and suggestions.

docker-compose.yml
ports:
- "3030:3030"
- "3031:3031"
command: smashing start
Copy link
Owner

Choose a reason for hiding this comment

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

This is great - thanks!

kohnech
kohnech commented Jul 29, 2020
View reviewed changes
Copy link
Contributor Author

@kohnech kohnech left a comment

Choose a reason for hiding this comment

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

@rouanw
Glad to see your comments here :)
I can make changes to your comments a bit later on foot right now...?

Kind regards,
kohnech

@kohnech kohnech requested a review from rouanw August 29, 2020 19:23
@kohnech
Copy link
Contributor Author

kohnech commented Aug 29, 2020

@rouanw I have fixed all your review comments and tested :

  1. guest login
  2. teamcity user with password
    please review again :)

rouanw
rouanw approved these changes Sep 1, 2020
View reviewed changes
Copy link
Owner

@rouanw rouanw left a comment

Choose a reason for hiding this comment

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

This looks great, thanks for making the changes @kohnech 🎉

I've tested your changes locally on MacOS and all is 👍

@rouanw rouanw merged commit 0ea7779 into rouanw:master Sep 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rouanw rouanw rouanw approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kohnech @rouanw