Docker improve rebased #450
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
If this looks good, go ahead and merge! :-) |
|
Thanks @alaxalves and @jywarren ! ! |
Closed
grvsachdeva
reviewed
Mar 31, 2019
| @@ -20,8 +20,6 @@ | |||
| //= require leaflet-providers/leaflet-providers.js | |||
| //= require leaflet-toolbar/dist/leaflet.toolbar.js | |||
| //= require leaflet-distortableimage/dist/leaflet.distortableimage.js | |||
| //= require leaflet-easybutton/src/easy-button.js | |||
| //= require leaflet-google/index.js | |||
There was a problem hiding this comment.
Hey @icarito @jywarren @alaxalves, this removal is causing trouble loading the map in development environment. Also, any reason for this removal?
There was a problem hiding this comment.
I had to remove those since Yarn wasn't being able to load those dependencies. Have you readded those and verified if if still fails on production and development?
|
Ah, we should def. re-add these -- do you remember what the issue was or
could you link us back if you already described it (sorry, it's been a big
process!) Sometimes we need to change the exact packages we point at in
Yarn since it uses a stricter package.json format than bower.json. we've
been able to find proper NPM packages for many of these in the following
files:
https://github.com/publiclab/plots2/tree/master/package.json
https://github.com/publiclab/Leaflet.DistortableImage/blob/main/package.json
For the Google layer, we've used this Leaflet plugin:
https://gitlab.com/IvanSanchez/Leaflet.GridLayer.GoogleMutant
Maybe part of it is that we're using a Bower shorthand for github
repositories in the original file
"leaflet-distortableimage": "publiclab/Leaflet.DistortableImage#^0.2.0",
"leaflet-easybutton": "CliffCloud/Leaflet.EasyButton#1.0.0",
"leaflet-toolbar": "Leaflet/Leaflet.Toolbar#~0.3.0",
"leaflet-providers": "leaflet-extras/leaflet-providers#1.0.6",
Many of these should have NPM packages, the first one especially. That
could make it pretty straightforward to switch over.
…On Mon, Apr 1, 2019 at 9:10 AM Álax de Carvalho Alves < ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In app/assets/javascripts/application.js
<#450 (comment)>:
> @@ -20,8 +20,6 @@
//= require leaflet-providers/leaflet-providers.js
//= require leaflet-toolbar/dist/leaflet.toolbar.js
//= require leaflet-distortableimage/dist/leaflet.distortableimage.js
-//= require leaflet-easybutton/src/easy-button.js
-//= require leaflet-google/index.js
I had to remove those since Yarn wasn't being able to load those
dependencies. Have you readded those and verified if if still fails on
production and development?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#450 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AABfJwimtTeJAL5G-rJ_VpJWB0za2qp9ks5vcgUfgaJpZM4cF-0Z>
.
|
20 tasks
icarito
added a commit
that referenced
this pull request
Apr 7, 2019
* Shortening docker image in ~30% * Caching bundle, gathering env variables and using newer sintax * Creating startup script and env file * Improving travis CI configuration * Loading assets in production env * Allow uglifier to interpret ES6 * Don't dettach when building container in travis * Fix start command * Fix travis script * Try to resolve travis tests invocation * Tweak travis script * Add delay * Bundle install before db setup * Shortening docker image in ~30% * Caching bundle, gathering env variables and using newer sintax * Creating startup script and env file * Improving travis CI configuration * Loading assets in production env * Allow uglifier to interpret ES6 * Fix start command * Fix travis script * Tweak travis script * Add delay * Revert assets changes * Return to Mysql5.7 * Tweak travis script * Fix make redeploy-container command * Add db migrate and precompile step. * Add bower install to Makefile * Clean after docker run. Avoid one bower run.
chen-robert
pushed a commit
to chen-robert/mapknitter
that referenced
this pull request
Dec 5, 2019
* Shortening docker image in ~30% * Caching bundle, gathering env variables and using newer sintax * Creating startup script and env file * Improving travis CI configuration * Loading assets in production env * Allow uglifier to interpret ES6 * Don't dettach when building container in travis * Fix start command * Fix travis script * Try to resolve travis tests invocation * Tweak travis script * Add delay * Bundle install before db setup * Shortening docker image in ~30% * Caching bundle, gathering env variables and using newer sintax * Creating startup script and env file * Improving travis CI configuration * Loading assets in production env * Allow uglifier to interpret ES6 * Fix start command * Fix travis script * Tweak travis script * Add delay * Revert assets changes * Return to Mysql5.7 * Tweak travis script * Fix make redeploy-container command * Add db migrate and precompile step. * Add bower install to Makefile * Clean after docker run. Avoid one bower run.
icarito
added a commit
that referenced
this pull request
Apr 14, 2020
* Shortening docker image in ~30% * Caching bundle, gathering env variables and using newer sintax * Creating startup script and env file * Improving travis CI configuration * Loading assets in production env * Allow uglifier to interpret ES6 * Don't dettach when building container in travis * Fix start command * Fix travis script * Try to resolve travis tests invocation * Tweak travis script * Add delay * Bundle install before db setup * Shortening docker image in ~30% * Caching bundle, gathering env variables and using newer sintax * Creating startup script and env file * Improving travis CI configuration * Loading assets in production env * Allow uglifier to interpret ES6 * Fix start command * Fix travis script * Tweak travis script * Add delay * Revert assets changes * Return to Mysql5.7 * Tweak travis script * Fix make redeploy-container command * Add db migrate and precompile step. * Add bower install to Makefile * Clean after docker run. Avoid one bower run.
jywarren
added a commit
that referenced
this pull request
May 5, 2020
* Shortening docker image in ~30% * Caching bundle, gathering env variables and using newer sintax * Creating startup script and env file * Improving travis CI configuration * Loading assets in production env * Allow uglifier to interpret ES6 * Fix start command * Fix travis script * Tweak travis script * Add delay * Revert assets changes * Return to Mysql5.7 * Tweak travis script * Fix make redeploy-container command * Add db migrate and precompile step. * Add bower install to Makefile * Clean after docker run. Avoid one bower run. * Changes to be able to build container in Google Cloud * Remove spurious symlink * Copy config examples when making build * Export env variable name * Tag cloud image * Add timeout * Push to cloud registry * Fix jenkins build error with docker-compose tty * Add app to container and .dockerignore all else * Copy configuration files when deploying to GCE * Allow copy config to container * Time extended (for cloud build & push) * Delete redundant index.html.erb file (#427) * Setupcoveralls (#438) * Add coveralls * Fix gemfile * Fix env variable * Add coveralls token * Update README.md * Remove legacy image controller code #404 (#417) Deleted the lines from the selection indicated in the issue. * Change comment count on comment creation via AJAX #441 (#443) This closes issue #441 "Change comment count on comment creation via AJAX #441" by incrementing comments-number each time a new comment is added. This would ensure that the counter indicating the number of comments is increased without needing to refresh the page. * update syntax of active record query(license method) (#439) Fixes #437 * Docker improve rebased (#450) * Shortening docker image in ~30% * Caching bundle, gathering env variables and using newer sintax * Creating startup script and env file * Improving travis CI configuration * Loading assets in production env * Allow uglifier to interpret ES6 * Don't dettach when building container in travis * Fix start command * Fix travis script * Try to resolve travis tests invocation * Tweak travis script * Add delay * Bundle install before db setup * Shortening docker image in ~30% * Caching bundle, gathering env variables and using newer sintax * Creating startup script and env file * Improving travis CI configuration * Loading assets in production env * Allow uglifier to interpret ES6 * Fix start command * Fix travis script * Tweak travis script * Add delay * Revert assets changes * Return to Mysql5.7 * Tweak travis script * Fix make redeploy-container command * Add db migrate and precompile step. * Add bower install to Makefile * Clean after docker run. Avoid one bower run. * updte pr template (#448) * Bump recaptcha from 4.13.1 to 4.13.2 (#452) Bumps [recaptcha](https://github.com/ambethia/recaptcha) from 4.13.1 to 4.13.2. - [Release notes](https://github.com/ambethia/recaptcha/releases) - [Changelog](https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md) - [Commits](ambethia/recaptcha@v4.13.1...v4.13.2) Signed-off-by: dependabot[bot] <support@dependabot.com> * Restructure rake test task runner (#380) * add a mysql setup file * Squash commits * Update README.md (#456) * Change run to exec (#457) * Bump paperclip from 4.2.4 to 4.3.7 (#285) Bumps [paperclip](https://github.com/thoughtbot/paperclip) from 4.2.4 to 4.3.7. - [Release notes](https://github.com/thoughtbot/paperclip/releases) - [Changelog](https://github.com/thoughtbot/paperclip/blob/v4.3.7/NEWS) - [Commits](thoughtbot/paperclip@v4.2.4...v4.3.7) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump test-unit from 3.3.0 to 3.3.1 (#458) Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/test-unit/test-unit/releases) - [Commits](test-unit/test-unit@3.3.0...3.3.1) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump coveralls from 0.7.1 to 0.8.22 (#453) Bumps [coveralls](https://coveralls.io) from 0.7.1 to 0.8.22. Signed-off-by: dependabot[bot] <support@dependabot.com> * gridview aligned (#464) * Alert improvement and adding byebug gem (#383) * byebug gem added and alerts in separate file * adding byebug history to gitignore * adding timestamp to redirect * added z-index to render login dropdown above leaflet icon * fixed image partial rendering when no images (#423) * fixed image partial rendering when no images. * toggle no images <p> om upload * fixed image partial rendering when no images. * Bump recaptcha from 4.13.2 to 4.14.0 (#471) Bumps [recaptcha](https://github.com/ambethia/recaptcha) from 4.13.2 to 4.14.0. - [Release notes](https://github.com/ambethia/recaptcha/releases) - [Changelog](https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md) - [Commits](ambethia/recaptcha@v4.13.2...v4.14.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * add a flash error when adding tags and not logged in (#473) * Upgrade app to Bootstrap 4 (#480) * Bootstrap 4 small button fixes (#488) * Add tests for comments and maps (#467) * Updated query style (#436) (#469) * Dynamic ports (#462) * Dynamic port in compose file * Omit setting container name * Add initial sql dump entry * Avoid resetting database on build * Shortening docker image in ~30% * Caching bundle, gathering env variables and using newer sintax * Creating startup script and env file * Improving travis CI configuration * Loading assets in production env * Tweak travis script * Roll back to using Debian 9 with custom built GDAL (#489) * Switch back to Debian 9 Stretch * Simplify docker image * Bump Ruby to 2.4.6 * Re-add dependency * Add dependency (zip) * Try pip install gdal * Install libgdal-dev * Revert attept to use pip * Bump ruby * Avoid naming containers in compose file * Avoid overwriting database on redeploy-container * Allow to load mysql dump * Include own GDAL packages * Disable ipv6 to prevent error * Add missing Amazon S3 yml to Makefile * Document unstable instance * Changes to be able to build container in Google Cloud * Copy config examples when making build * Add app to container and .dockerignore all else * Fixed missed merge * Add db configurability by env vars for containers * Fix db config * Copy configs * Switch keyserver * Add env vars, tweak make * Substitute env vars parameters * Env var control * Show env vars * env not ENV * add DB_SOCKET * Add recomended parameters * Not deploy app engine, show cloudsql dir * Omit list cloudsql dir * Added correct image tag * Add database parameters as env vars * Support $PORT env var * Using Node 12 and Yarn for Dockerfile.txt as well * Changing Passenger's port on production env * Setting local db for travis * set .env PORT to $PORT * Remove .env * Compose environment variableZ fallback * Revert all files under /app to versions in main * Revert to main * Delete unneeded files * Remove extra files from rebase * Add bundle install as build step * Deleted not needed Dockerfile * Missed RUN in Dockerfile * Add precompile step * Hardcode environment at build time * Adding missing yaml and update bootsnap version * Omit /app/tmp from volume * Revert try to get precompile to work * Clean up patch for merging * List variables in app.yaml * Tweak for jenkins * Add .env for jenkins * Fix PORT for jenkins/docker-compose * Address PORT properly * New form ports * Enclose docker-compose ports in quotes * ports yaml should be object not array * Try different format for ports * Try docker-compose format * Redirect script for AppEngine * Try to revertt to working condition for appengine * Point PORT in Procfile * Revert to known good config in appengine * Tweak assets precompilation * Restore PORT setting * Add redirect to map /warps directory to legacy archive * Add .env for jenkins/docker-compose * Add hardcoded route to legacy warps * Remove .env for appengine * Satisfy appengine docker-compose * Ignore app.yaml * Ignore app.yaml secrets * Satisfy Jenkins wihout hurting appengine hopefully Co-authored-by: Sebastian Silva <sebastian@fuentelibre.org> Co-authored-by: rarrunategu1 <parker.rose@ymail.com> Co-authored-by: Jeffrey Warren <jeff@unterbahn.com> Co-authored-by: Milo MacPhail <40954168+milomacphail@users.noreply.github.com> Co-authored-by: Sonali Agrawal <sonali9696@gmail.com> Co-authored-by: Ananya Agrawal <33188930+ananya@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> Co-authored-by: Sasha Boginsky <41092741+sashadev-sky@users.noreply.github.com> Co-authored-by: Kaustubh Nair <kaustubh.nair@iiitb.org> Co-authored-by: Divya Baid <32747809+divyabaid16@users.noreply.github.com> Co-authored-by: Gaurav Sachdeva <sachdeva.gaurav1997@gmail.com> Co-authored-by: Govind Jeevan <govindjeevan7@gmail.com> Co-authored-by: Cess <cessmbuguar@gmail.com> Co-authored-by: Stefanni <stefannibrasil@gmail.com> Co-authored-by: hc-barker <hc-barker@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi here I've gone over the merge conflicts that I found when trying to rebase into main branch, hopefully this is correct, I've set it up to build with Jenkins to begin with.
This should supercede #429 if my Git fu is correct!
Make sure these boxes are checked before your pull request is ready to be reviewed and merged. Thanks!
rake testThanks!