kamikazechaser/cic-internal-integration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'bvander/fix-notify-migrations' into 'master'

Browse Source 
migrations fix

See merge request grassrootseconomics/cic-internal-integration!237
This commit is contained in:
Blair Vanderlugt 2021-07-28 23:33:34 +00:00
commit 1c78f4d6d6
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/cic-notify/docker/Dockerfile
View File

@ -15,8 +15,8 @@ RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
COPY . . COPY . .
RUN python setup.py install RUN python setup.py install
COPY docker/*.sh . COPY docker/start_tasker.sh .
RUN chmod +x /root/*.sh RUN chmod +x start_tasker.sh
# ini files in config directory defines the configurable parameters for the application # ini files in config directory defines the configurable parameters for the application
# they can all be overridden by environment variables # they can all be overridden by environment variables

8
apps/cic-notify/docker/Dockerfile_ci
View File

@ -11,14 +11,12 @@ RUN pip install --index-url https://pypi.org/simple \
--extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \ --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \
-r requirements.txt -r requirements.txt
COPY . . COPY . .
RUN python setup.py install RUN python setup.py install
# TODO please review..can this go into requirements? COPY docker/start_tasker.sh .
RUN pip install $pip_extra_index_url_flag .[africastalking,notifylog] RUN chmod +x start_tasker.sh
COPY docker/*.sh .
# ini files in config directory defines the configurable parameters for the application # ini files in config directory defines the configurable parameters for the application
# they can all be overridden by environment variables # they can all be overridden by environment variables

2
apps/cic-notify/docker/db.sh
View File

@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
migrate.py -c /usr/local/etc/cic-notify --migrations-dir /usr/local/share/cic-notify/alembic -vv python migrate.py -c /usr/local/etc/cic-notify --migrations-dir /usr/local/share/cic-notify/alembic -vv