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

Improving docker #363

Closed
wants to merge 33 commits into from
Closed

Improving docker #363

wants to merge 33 commits into from

Conversation

alaxalves
Copy link
Member

@alaxalves alaxalves commented Feb 27, 2019 •
edited
Loading

Fixes #351
Make sure these boxes are checked before your pull request is ready to be reviewed and merged. Thanks!

  • tests pass -- rake test
  • code has been rebased on top of latest master (check if another pull request was added recently, and please rebase)
  • pull request is descriptively named and, if possible, multiple commits squashed if they're smaller changes

Thanks!

@welcome
Copy link

welcome bot commented Feb 27, 2019

Thanks for opening this pull request! Dangerbot will test out your code and reply in a bit with some pointers and requests.
There may be some errors, but don't worry! We're here to help! 👍🎉😄

@alaxalves alaxalves force-pushed the improving-docker branch 6 times, most recently from c8b204b to 86353c9 Compare February 27, 2019 12:56
@alaxalves
Copy link
Member Author

It would be great having docker for development environment too. If you'd like I could work on this too. 😄

alaxalves
alaxalves commented Feb 27, 2019
View reviewed changes
Dockerfile Show resolved Hide resolved
alaxalves
alaxalves commented Feb 27, 2019
View reviewed changes
Dockerfile Show resolved Hide resolved
alaxalves
alaxalves commented Feb 27, 2019
View reviewed changes
Dockerfile Show resolved Hide resolved
alaxalves
alaxalves commented Feb 27, 2019
View reviewed changes
Dockerfile Outdated Show resolved Hide resolved
alaxalves
alaxalves commented Feb 27, 2019
View reviewed changes
Dockerfile Show resolved Hide resolved
alaxalves
alaxalves commented Feb 27, 2019
View reviewed changes
Dockerfile Show resolved Hide resolved
alaxalves
alaxalves commented Feb 27, 2019
View reviewed changes
Dockerfile Show resolved Hide resolved
alaxalves
alaxalves commented Feb 27, 2019
View reviewed changes
.travis.yml Show resolved Hide resolved
alaxalves
alaxalves commented Feb 27, 2019
View reviewed changes
.travis.yml Outdated Show resolved Hide resolved
@jywarren
Copy link
Member

Oh wow, lots of changes here. Pinging @icarito for a review! Thank you!

@jywarren jywarren requested a review from icarito February 27, 2019 19:50
icarito
icarito approved these changes Mar 1, 2019
View reviewed changes
Copy link
Member

@icarito icarito left a comment

Choose a reason for hiding this comment

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

I'll test this locally, some good ideas here! I've been working exactly on this issue of dependencies for plots2 because we've been installing bundles and modules at build time, if it works maybe we can adopt it for publiclab.org.

Dockerfile Show resolved Hide resolved
docker-compose.yml Show resolved Hide resolved
docker-compose.yml Show resolved Hide resolved
.travis.yml Outdated Show resolved Hide resolved
@icarito icarito mentioned this pull request Mar 1, 2019
Closed
@icarito
Copy link
Member

icarito commented Mar 1, 2019

Trying this but I'm failing to install assets with bower... maybe I'll try #357 too

jywarren and others added 4 commits March 16, 2019 15:22
@jywarren
Modularization of export code (publiclab#341)
628b8b5 
* starting to move things into exporter lib, parameterize

* additional mysql2 adapter change, sqlite compatibility

* moved almost all of exporter code into ruby lib

* Try to update GDAL from sources

* Update Dockerfile

* Try running Buster (publiclab#186)

* Try running Buster

* Include binary GDal

* Reorder Dockerfile

* Install npm

* Tweak apt command

* Update Dockerfile

* Simplfy

* Rollback ruby upgrade and rather install 2.4.4 from rvm

* Add login shell to support rvm

* Mysql deps

* Include git

* Fix entry command

* Move start command

* Revert "Fix entry command"

This reverts commit 1833f41.

* Remove entrypoint from Dockerfile

* Add -l parameter to bash

* More deps

* Bump mysql2 from 0.3.21 to 0.5.2

Bumps [mysql2](https://github.com/brianmario/mysql2) from 0.3.21 to 0.5.2.
- [Release notes](https://github.com/brianmario/mysql2/releases)
- [Changelog](https://github.com/brianmario/mysql2/blob/master/CHANGELOG.md)
- [Commits](brianmario/mysql2@0.3.21...0.5.2)

Signed-off-by: dependabot[bot] <[email protected]>

* activerecord-mysql2-adapter

* Return to mysql2 < 4 gem and add some grease

* Update exporter_test.rb

* Update exporter_test.rb

* Update exporter.rb

* Update exporter_test.rb
@dependabot @jywarren
Bump will_paginate from 3.1.6 to 3.1.7 (publiclab#414)
afa176c 
Bumps [will_paginate](https://github.com/mislav/will_paginate) from 3.1.6 to 3.1.7.
- [Release notes](https://github.com/mislav/will_paginate/releases)
- [Commits](mislav/will_paginate@v3.1.6...v3.1.7)

Signed-off-by: dependabot[bot] <[email protected]>
@coreytegeler @jywarren
fix outdated ruby versions listed in README publiclab#412 (publiclab#416
f3fa25b 
)
@jywarren
Update config.yml
7c00261
@icarito icarito mentioned this pull request Mar 20, 2019
Merged
3 tasks
@icarito
Copy link
Member

icarito commented Mar 20, 2019

@alaxalves I appreciate your patience - let's merge #418 which contains some of your ideas and then I'll try to rebase this patch on top of master! I figured out the issue with assets at least now we have a staging instance (will document it real soon)!

@icarito @jywarren
Deployment tweaks including Makefile and start script (publiclab#418)
f4650a7 
* Start script plus Makefile

* Add COMPOSE_HTTP_TIMEOUT

* Omit checking subdomains. This should be done at nginx level.

* Add precompile step to Makefile
@jywarren
Copy link
Member

#418 merged!

@alaxalves
Copy link
Member Author

@icarito If you want me to do something, let me know! ;) BTW how did you solve the assets issue? 🤔

@icarito
Copy link
Member

icarito commented Mar 21, 2019

Here I rebased on top of current head maybe there's still some tweaking to be done!

@icarito
Copy link
Member

icarito commented Mar 21, 2019

I think I messed up and I merged from main branch into this branch instead of rebasing this branch on top of main. I'm confused and not sure how to fix it. As it stands it can be merged @jywarren but maybe it's not the right way to do it?

@jywarren jywarren mentioned this pull request Mar 21, 2019
Closed
@jywarren
Copy link
Member

No problem, here - i just rebased it cleanly on top of the main branch. It wasn't a clean rebase, i had to review each step, but I think i got it right. If this looks good, go ahead and merge it, then close this one? #429

Thanks all!

@jywarren
Copy link
Member

@alaxalves i guess here? https://github.com/publiclab/mapknitter/pull/429/files#diff-1d98f0039bbc6df92adee882ed99d993

@icarito
Copy link
Member

icarito commented Mar 22, 2019 via email

@icarito
Copy link
Member

icarito commented Mar 25, 2019

This has been merged now at PR #450 obrigado @alaxalves I learned a lot!

@icarito icarito closed this Mar 25, 2019
@jywarren
Copy link
Member

Fantastic!!!

This was referenced Apr 2, 2019
Open
Closed
Closed
@alaxalves alaxalves deleted the improving-docker branch August 30, 2019 19:54
@alaxalves alaxalves mentioned this pull request May 19, 2020
Open
33 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kaustubh-nair kaustubh-nair kaustubh-nair left review comments

@icarito icarito icarito approved these changes

@jywarren jywarren jywarren left review comments

Assignees

@alaxalves alaxalves

Labels
in progress
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@alaxalves @jywarren @icarito @kaustubh-nair @siaw23-retired @grvsachdeva @sashadev-sky @govindjeevan @Jordenng @coreytegeler