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

Get Mapknitter running into the Google Cloud v2 #1273

Merged
merged 130 commits into from
May 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
dd6756b
Shortening docker image in ~30%
alaxalves Feb 27, 2019
ad3bc24
Caching bundle, gathering env variables and using newer sintax
alaxalves Feb 27, 2019
d54686b
Creating startup script and env file
alaxalves Feb 27, 2019
a7ef7a7
Improving travis CI configuration
alaxalves Feb 27, 2019
a1049e3
Loading assets in production env
alaxalves Mar 5, 2019
7959f7b
Allow uglifier to interpret ES6
alaxalves Mar 5, 2019
19ada8e
Fix start command
icarito Mar 21, 2019
d620512
Fix travis script
icarito Mar 21, 2019
935be16
Tweak travis script
icarito Mar 21, 2019
5c72ffe
Add delay
icarito Mar 21, 2019
9d9f3ea
Revert assets changes
icarito Mar 22, 2019
f6372c9
Return to Mysql5.7
icarito Mar 22, 2019
efc01e2
Tweak travis script
icarito Mar 22, 2019
2af8a5d
Fix make redeploy-container command
icarito Mar 22, 2019
7c49d70
Add db migrate and precompile step.
icarito Mar 23, 2019
4b4c64e
Add bower install to Makefile
icarito Mar 23, 2019
3d12cad
Clean after docker run. Avoid one bower run.
icarito Mar 23, 2019
a16a4c6
Changes to be able to build container in Google Cloud
icarito Mar 24, 2019
abb64e8
Remove spurious symlink
icarito Mar 24, 2019
2aea36b
Copy config examples when making build
icarito Mar 24, 2019
f19fce8
Export env variable name
icarito Mar 24, 2019
5ad4541
Tag cloud image
icarito Mar 24, 2019
c0371a3
Add timeout
icarito Mar 24, 2019
2251b9a
Push to cloud registry
icarito Mar 24, 2019
f57ae30
Fix jenkins build error with docker-compose tty
icarito Mar 24, 2019
5d5f0d9
Add app to container and .dockerignore all else
icarito Mar 25, 2019
71fc7eb
Copy configuration files when deploying to GCE
icarito Mar 25, 2019
0f376bd
Allow copy config to container
icarito Mar 25, 2019
1b90a6d
Time extended (for cloud build & push)
icarito Mar 25, 2019
055e127
Delete redundant index.html.erb file (#427)
rarrunategu1 Mar 21, 2019
5ce0385
Setupcoveralls (#438)
jywarren Mar 22, 2019
5c640d6
Remove legacy image controller code #404 (#417)
milomacphail Mar 22, 2019
a635bde
Change comment count on comment creation via AJAX #441 (#443)
sonali9696 Mar 23, 2019
d03b16d
update syntax of active record query(license method) (#439)
ananya Mar 23, 2019
3fccda2
Docker improve rebased (#450)
icarito Mar 25, 2019
29450fd
updte pr template (#448)
ananya Mar 25, 2019
494e6de
Bump recaptcha from 4.13.1 to 4.13.2 (#452)
dependabot[bot] Mar 25, 2019
ad5557f
Restructure rake test task runner (#380)
sashadev-sky Mar 25, 2019
933581f
Update README.md (#456)
kaustubh-nair Mar 26, 2019
afe88af
Change run to exec (#457)
sashadev-sky Mar 27, 2019
2661538
Bump paperclip from 4.2.4 to 4.3.7 (#285)
dependabot[bot] Mar 27, 2019
1b645a2
Bump test-unit from 3.3.0 to 3.3.1 (#458)
dependabot[bot] Mar 29, 2019
ef157c9
Bump coveralls from 0.7.1 to 0.8.22 (#453)
dependabot[bot] Mar 29, 2019
f61168e
gridview aligned (#464)
divyabaid16 Mar 29, 2019
c605073
Alert improvement and adding byebug gem (#383)
grvsachdeva Mar 30, 2019
2cc8c3d
fixed image partial rendering when no images (#423)
govindjeevan Mar 31, 2019
8dc1c75
Bump recaptcha from 4.13.2 to 4.14.0 (#471)
dependabot[bot] Apr 2, 2019
52ee767
add a flash error when adding tags and not logged in (#473)
cesswairimu Apr 2, 2019
43e3f40
Upgrade app to Bootstrap 4 (#480)
Apr 4, 2019
74a51e0
Bootstrap 4 small button fixes (#488)
Apr 4, 2019
5ec6984
Add tests for comments and maps (#467)
kaustubh-nair Apr 4, 2019
f8e3816
Updated query style (#436) (#469)
hc-barker Apr 4, 2019
e8e9d9c
Dynamic ports (#462)
icarito Apr 5, 2019
b003177
Roll back to using Debian 9 with custom built GDAL (#489)
icarito Apr 5, 2019
1e2cc10
Shortening docker image in ~30%
alaxalves Feb 27, 2019
a417253
Caching bundle, gathering env variables and using newer sintax
alaxalves Feb 27, 2019
b0a4244
Creating startup script and env file
alaxalves Feb 27, 2019
2dfe7c7
Improving travis CI configuration
alaxalves Feb 27, 2019
7939f8b
Loading assets in production env
alaxalves Mar 5, 2019
15b4da6
Tweak travis script
icarito Mar 21, 2019
491bf11
Changes to be able to build container in Google Cloud
icarito Mar 24, 2019
95f61dd
Copy config examples when making build
icarito Mar 24, 2019
149e4e3
Add app to container and .dockerignore all else
icarito Mar 25, 2019
6223a92
Fixed missed merge
icarito Apr 7, 2019
9c77f50
Add db configurability by env vars for containers
icarito Apr 17, 2019
931fa0c
Fix db config
icarito Apr 17, 2019
c412eef
Copy configs
icarito Apr 17, 2019
789f870
Switch keyserver
icarito Apr 17, 2019
231cc1a
Add env vars, tweak make
icarito Apr 18, 2019
17d1a95
Substitute env vars parameters
icarito Apr 18, 2019
2401328
Env var control
icarito Apr 18, 2019
507446b
Show env vars
icarito Apr 18, 2019
da5c15c
env not ENV
icarito Apr 18, 2019
0d03771
add DB_SOCKET
icarito Apr 18, 2019
cb0858a
Add recomended parameters
icarito Apr 18, 2019
ec3a7bc
Not deploy app engine, show cloudsql dir
icarito Apr 18, 2019
257631c
Omit list cloudsql dir
icarito Apr 18, 2019
12621b3
Merge branch 'gcloud_build' of https://github.com/publiclab/mapknitte…
alaxalves Apr 26, 2020
a41a70c
Merge branch 'main' of https://github.com/publiclab/mapknitter into m…
alaxalves Apr 26, 2020
2f75a0c
Added correct image tag
icarito Apr 26, 2020
6b5627d
Add database parameters as env vars
icarito Apr 26, 2020
a5a4a18
Support $PORT env var
icarito Apr 26, 2020
03b1d3b
Using Node 12 and Yarn for Dockerfile.txt as well
alaxalves Apr 26, 2020
8b6ebcf
Changing Passenger's port on production env
alaxalves Apr 26, 2020
16dfcc7
Setting local db for travis
alaxalves Apr 26, 2020
ee69ccb
set .env PORT to $PORT
icarito Apr 26, 2020
77ab854
Merge branch 'mapknitter.gcloud_build' of http://github.com/publiclab…
icarito Apr 26, 2020
a17af1d
Remove .env
icarito Apr 26, 2020
0363b6c
Compose environment variableZ fallback
icarito Apr 26, 2020
793dbe0
Revert all files under /app to versions in main
icarito Apr 28, 2020
40455df
Revert to main
icarito Apr 28, 2020
7ae6b98
Delete unneeded files
icarito Apr 28, 2020
800da0e
Remove extra files from rebase
icarito Apr 28, 2020
0f2f576
Add bundle install as build step
icarito Apr 28, 2020
b18d999
Deleted not needed Dockerfile
icarito Apr 28, 2020
811605d
Missed RUN in Dockerfile
icarito Apr 28, 2020
d772a5a
Add precompile step
icarito Apr 28, 2020
74f688f
Hardcode environment at build time
icarito Apr 28, 2020
43e779d
Adding missing yaml and update bootsnap version
alaxalves Apr 28, 2020
174133e
Merge branch 'mapknitter.gcloud_build' of https://github.com/publicla…
alaxalves Apr 28, 2020
7c9daff
Merge branch 'mapknitter.gcloud_build' of https://github.com/publicla…
alaxalves Apr 28, 2020
4cdd24e
Merge branch 'main' of https://github.com/publiclab/mapknitter into m…
alaxalves Apr 28, 2020
2a7be99
Merge branch 'mapknitter.gcloud_build' of http://github.com/publiclab…
icarito Apr 28, 2020
cdffc83
Omit /app/tmp from volume
icarito Apr 28, 2020
8c4adf9
Revert try to get precompile to work
icarito Apr 28, 2020
d23a54b
Clean up patch for merging
icarito Apr 29, 2020
61db31e
List variables in app.yaml
icarito Apr 29, 2020
6114320
Tweak for jenkins
icarito Apr 29, 2020
c494e2c
Add .env for jenkins
icarito Apr 29, 2020
8f6f8f6
Fix PORT for jenkins/docker-compose
icarito Apr 29, 2020
1fdb48d
Address PORT properly
icarito Apr 29, 2020
4ee0c8a
New form ports
icarito Apr 29, 2020
437f65e
Enclose docker-compose ports in quotes
icarito Apr 29, 2020
8bd99e6
ports yaml should be object not array
icarito Apr 29, 2020
97e9d66
Try different format for ports
icarito Apr 29, 2020
7474774
Try docker-compose format
icarito Apr 29, 2020
4290838
Redirect script for AppEngine
icarito Apr 30, 2020
91adfd6
Try to revertt to working condition for appengine
icarito Apr 30, 2020
83d36b2
Point PORT in Procfile
icarito Apr 30, 2020
0fb07b0
Revert to known good config in appengine
icarito Apr 30, 2020
5925808
Tweak assets precompilation
icarito Apr 30, 2020
327020e
Restore PORT setting
icarito Apr 30, 2020
63feb6a
Add redirect to map /warps directory to legacy archive
icarito Apr 30, 2020
8674246
Add .env for jenkins/docker-compose
icarito Apr 30, 2020
af46e26
Add hardcoded route to legacy warps
icarito Apr 30, 2020
7c8dd13
Remove .env for appengine
icarito Apr 30, 2020
340f611
Satisfy appengine docker-compose
icarito Apr 30, 2020
6a7bdc5
Ignore app.yaml
icarito May 2, 2020
22a03b1
Ignore app.yaml secrets
icarito May 2, 2020
1d4cf40
Satisfy Jenkins wihout hurting appengine hopefully
icarito May 2, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .env

This file was deleted.

43 changes: 43 additions & 0 deletions .gcloudignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile ~/.gitignore_global

# Ignore bundler config
/.bundle

# Ignore the default SQLite database.
/db/*.sqlite3

# Ignore all logfiles and tempfiles.
/tmp
*.swp
*.swo
*~
.ruby-version
.DS_Store
log/
tmp/*
tmp/**/*
coverage*
public/warpables/*
public/system/*
public/warps/*
public/tms/*
db/schema.rb
*.db
config/database.yml
config/amazon_s3.yml
config/initializers/recaptcha.rb
config/config.yml
config/initializers/site_keys.rb
vendor/bundle
app/assets/bower_components
app/assets/node_modules
public/assets
public/lib
node_modules
todo.txt
.sass-cache
.git/
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
# Ignore bundler config
/.bundle

# avoid committing your secrets inadvertly
./app.yaml

# Ignore the default SQLite database.
/db/*.sqlite3

Expand Down
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ env:
- RAILS_ENV=test
- CI=true
- TRAVIS=true
- DB_HOST='127.0.0.1'
- DB_USER='mapknitter'
- DB_PASS='mapknitter'
- DB_NAME='mapknitter'

jobs:
include:
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,6 @@ RUN git config --global url."https://".insteadOf git://
COPY . /app/
WORKDIR /app

RUN bundle install

CMD [ "sh", "/app/start.sh" ]
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ group :dependencies do
gem 'open_id_authentication'
gem 'RubyInline', '~> 3.12.5'
gem 'paperclip', '~> 6.1.0'
gem 'bootsnap', '~> 1.4.5'
gem 'bootsnap', '~> 1.4.6'
gem 'turbolinks', '~> 5'
gem 'mini_magick', '~> 4.8'
gem 'puma', '~> 4.3.3'
Expand Down
Loading