Commit Graph

1796 Commits

Author SHA1 Message Date
Mateusz Konieczny
18f365524f
Merge pull request #763 from colouring-cities/feature/tweak-name
Improve name of unclassified buildings
2022-02-14 13:38:44 +01:00
Mateusz Konieczny
ead7c93867 Note that downgrades will fail of such data is present
As there is no unknown building type reclassifying is impossible
2022-02-14 13:36:19 +01:00
Mateusz Konieczny
bba80f4511 Allow multiline legend entries
text will pleasantly flow on right side rather than appearing under icon
2022-02-14 13:36:19 +01:00
Mateusz Konieczny
fe94a51da4 Modify already commited migration
this avoids confusing migration in repository that could damage data, as meaning of the data in database mismatched decription
2022-02-14 13:36:19 +01:00
Mateusz Konieczny
a08da58ad3 Undo accidental bump of mapnik version 2022-02-14 13:36:19 +01:00
Mateusz Konieczny
9ba7e04f91 Improve name of unclassified 2022-02-14 13:36:19 +01:00
Ed Chalstrey
e3fbff97b1 revert Vagrant changes, added to separate branch fix-vagrant 2022-02-14 09:58:50 +00:00
Ed Chalstrey
99056aac4b remove docker stuff - new branch: dockerise-colouring-london 2022-02-14 09:48:59 +00:00
Ed Chalstrey
bb793487b6 fix migrations path 2022-02-11 16:15:42 +00:00
Ed Chalstrey
b4475f6938 just use installed python3 instead of virtual environment 2022-02-11 16:07:07 +00:00
Ed Chalstrey
8f8bd934d7 alternate way to install pyenv 2022-02-11 15:53:11 +00:00
Ed Chalstrey
40fc5e4c89 add dockeruser to psql cmds 2022-02-11 15:41:25 +00:00
Ed Chalstrey
1f417ecb7d simplify postgres installs 2022-02-11 15:16:34 +00:00
Ed Chalstrey
b96e2399cd add etl and migrations volumes 2022-02-11 11:59:43 +00:00
Ed Chalstrey
868af65745 move python stuff to postgres container 2022-02-11 11:57:48 +00:00
Ed Chalstrey
e9a3b3eb1b fix etl path 2022-02-11 11:55:46 +00:00
Ed Chalstrey
3216c4796a add yes flags 2022-02-11 11:45:13 +00:00
Ed Chalstrey
d9ed9f40a2 remove sudo cmds init db 2022-02-11 11:45:03 +00:00
Ed Chalstrey
02745d3f1f use ubuntu postgres base image (pg13) 2022-02-11 11:24:50 +00:00
Ed Chalstrey
55151524d0 reduce number of things called postgres 2022-02-09 11:28:07 +00:00
Ed Chalstrey
42f118bf9f change DATABASE_URL (still errors) 2022-02-09 10:15:20 +00:00
Ed Chalstrey
5cae3abf2b use apt-get 2022-02-09 10:03:12 +00:00
Ed Chalstrey
af6a9cfde3 moce APP_COOKIE_SECRET 2022-02-09 09:52:12 +00:00
Ed Chalstrey
ac9a8f4509 add sudo cmds 2022-02-08 15:56:05 +00:00
Ed Chalstrey
2ce2410c14 remove node modules before install 2022-02-08 15:51:28 +00:00
Ed Chalstrey
e87a979a6b fix dockerfile path 2022-02-08 14:52:25 +00:00
Ed Chalstrey
6f2f0f0b7b rename postgres container 2022-02-08 14:13:23 +00:00
Ed Chalstrey
be73c1d39a ubuntu 18 base img 2022-02-08 14:09:57 +00:00
Ed Chalstrey
028bbe5d69 move vars to yaml 2022-02-08 14:09:42 +00:00
Ed Chalstrey
622158ab5e use docker compose 2022-02-08 14:05:12 +00:00
Ed Chalstrey
2dd405a394 remove steps addeed to bash 2022-02-08 11:25:49 +00:00
Ed Chalstrey
214739cb2a remove duplicate WORKDIR 2022-02-08 11:07:00 +00:00
Ed Chalstrey
c437547949 reemove version check 2022-02-08 10:57:21 +00:00
Ed Chalstrey
b8fa8a4147 move python bits to bash 2022-02-08 10:48:36 +00:00
Ed Chalstrey
9ad4a82c76 reorder dockerfile 2022-02-08 10:45:19 +00:00
Ed Chalstrey
7c0936a063 move db setup to entrypoint bash file 2022-02-08 10:31:54 +00:00
Ed Chalstrey
cac2c5bcf2 comment out echo and export cmds 2022-02-08 10:09:49 +00:00
Ed Chalstrey
13c17959ea install node with nvm 2022-02-08 10:02:31 +00:00
Ed Chalstrey
3ecca95866 dont use export vars 2022-02-08 09:49:42 +00:00
Ed Chalstrey
47449a91c8 switch base docker image to ubuntu/postgres 2022-02-08 09:47:10 +00:00
Ed Chalstrey
2aa7a84d91 comment out postgresql-14-postgis-3 for now 2022-02-07 17:04:37 +00:00
Ed Chalstrey
bb4ca6aca8 add yes flag 2022-02-07 16:16:04 +00:00
Ed Chalstrey
c6baedbca0 remove apt-get installs of things we don't need 2022-02-07 15:29:01 +00:00
Ed Chalstrey
9e7cc6e0c3 use COPY instead of git clone 2022-02-07 14:35:42 +00:00
Ed Chalstrey
36e28ced36 reorder installations and add WORKDIR selection 2022-02-07 14:24:34 +00:00
Ed Chalstrey
a9054c8ef0 add wait 2022-02-07 14:17:44 +00:00
Ed Chalstrey
e43a200ee6 bring compose in line with dockerfile 2022-02-07 14:16:36 +00:00
Ed Chalstrey
c5a583f2a2 choose npm start var names docker 2022-02-07 14:10:46 +00:00
Ed Chalstrey
e1a12c8008 rudimentary dockerfile 2022-02-07 14:05:30 +00:00
Ed Chalstrey
226c9a1a5f add etl files with specific db name 2022-02-07 13:45:55 +00:00