a_adli/colouring-montreal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move python bits to bash

Browse Source
This commit is contained in:
Ed Chalstrey 2022-02-08 10:48:36 +00:00
parent 9ad4a82c76
commit b8fa8a4147
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Dockerfile
View File

@ -65,19 +65,19 @@ COPY ./init-user-db.sh /docker-entrypoint-initdb.d/init-user-db.sh
# RUN ls ./colouring-london/migrations/*.up.sql 2>/dev/null | while read -r migration; do psql -d colouringlondon < $migration; done; # RUN ls ./colouring-london/migrations/*.up.sql 2>/dev/null | while read -r migration; do psql -d colouringlondon < $migration; done;
RUN pyvenv colouringlondon # RUN pyvenv colouringlondon
RUN source colouringlondon/bin/activate # RUN source colouringlondon/bin/activate
RUN pip install --upgrade pip # RUN pip install --upgrade pip
RUN pip install --upgrade setuptools wheel # RUN pip install --upgrade setuptools wheel
RUN pip install -r ./colouring-london/etl/requirements.txt # RUN pip install -r ./colouring-london/etl/requirements.txt
WORKDIR ./colouring-london/app/etl # WORKDIR ./colouring-london/app/etl
RUN python get_test_polygons.py # RUN python get_test_polygons.py
RUN ./load_geometries_cl.sh ./ # RUN ./load_geometries_cl.sh ./
RUN psql -d colouringlondon < ../migrations/002.index-geometries.up.sql # RUN psql -d colouringlondon < ../migrations/002.index-geometries.up.sql
RUN ./create_building_records_cl.sh # RUN ./create_building_records_cl.sh
RUN psql -d colouringlondon < ../migrations/003.index-buildings.up.sql # UN psql -d colouringlondon < ../migrations/003.index-buildings.up.sql
RUN ls ./colouring-london/migrations/*.up.sql 2>/dev/null | while read -r migration; do psql -d colouringlondon < $migration; done; # RUN ls ./colouring-london/migrations/*.up.sql 2>/dev/null | while read -r migration; do psql -d colouringlondon < $migration; done;
# RUN export NODEJS_HOME=/usr/local/lib/node/node-v16.13.2/bin/ # RUN export NODEJS_HOME=/usr/local/lib/node/node-v16.13.2/bin/
# RUN export PATH=$NODEJS_HOME:$PATH # RUN export PATH=$NODEJS_HOME:$PATH

13
init-user-db.sh
View File

@ -12,3 +12,16 @@ psql -d colouringlondon -c "create extension pgcrypto;"
psql -d colouringlondon -c "create extension pg_trgm;" psql -d colouringlondon -c "create extension pg_trgm;"
ls ./colouring-london/migrations/*.up.sql 2>/dev/null | while read -r migration; do psql -d colouringlondon < $migration; done; ls ./colouring-london/migrations/*.up.sql 2>/dev/null | while read -r migration; do psql -d colouringlondon < $migration; done;
pyvenv colouringlondon
source colouringlondon/bin/activate
pip install --upgrade pip
pip install --upgrade setuptools wheel
pip install -r ./colouring-london/etl/requirements.txt
python ./colouring-london/app/etl/get_test_polygons.py
./colouring-london/app/etl/load_geometries_cl.sh ./
psql -d colouringlondon < ./colouring-london/app/migrations/002.index-geometries.up.sql
./create_building_records_cl.sh
psql -d colouringlondon < ./colouring-london/app/migrations/003.index-buildings.up.sql
ls ./colouring-london/migrations/*.up.sql 2>/dev/null | while read -r migration; do psql -d colouringlondon < $migration; done;