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.

Sign up for GitHub

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

Jump to bottom

Fix 3rdparty example bugs #4

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix 3rdparty example bugs #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4ab648
Fix postgres up: POSTGRES_HOST_AUTH_METHOD: trust
zdfowler Aug 15, 2020
36887d5
Remove hyphens in image names that do not match
zdfowler Aug 15, 2020
0509257
Update MarkupSafe to 1.1 to get build to work
zdfowler Aug 15, 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
2 changes: 1 addition & 1 deletion 3rdparty/codeship-python-django-todoapp-v2/_dockerslim/db_create.command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
here="$(dirname "$BASH_SOURCE")"
cd $here

docker run -it --rm --name="db_create" -e DATABASE_URL='postgres://todoapp@postgres/todos' --network codeship-python-django-todoapp-v2_default codeship-python-django-todoapp-v2_web python manage.py migrate
docker run -it --rm --name="db_create" -e DATABASE_URL='postgres://todoapp@postgres/todos' --network codeshippythondjangotodoappv2_default codeshippythondjangotodoappv2_web python manage.py migrate

3 changes: 2 additions & 1 deletion 3rdparty/codeship-python-django-todoapp-v2/_dockerslim/docker-compose.slim.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3'
services:
web:
image: codeship-python-django-todoapp-v2_web.slim
image: codeshippythondjangotodoappv2_web.slim
command: sh -c "sleep 7 && python manage.py migrate && gunicorn -b 0.0.0.0:8000 todosapp.wsgi:application"
depends_on:
- postgres
Expand All @@ -17,3 +17,4 @@ services:
environment:
POSTGRES_USER: todoapp
POSTGRES_DB: todos
POSTGRES_HOST_AUTH_METHOD: trust
2 changes: 1 addition & 1 deletion 3rdparty/codeship-python-django-todoapp-v2/_dockerslim/run_app_only_slim.command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
here="$(dirname "$BASH_SOURCE")"
cd $here

docker run -it --rm --name="django_todo_app" -p 8000:8000 -e "DATABASE_URL=postgres://todoapp@postgres/todos" --network codeship-python-django-todoapp-v2_default codeship-python-django-todoapp-v2_web.slim gunicorn -b 0.0.0.0:8000 todosapp.wsgi:application
docker run -it --rm --name="django_todo_app" -p 8000:8000 -e "DATABASE_URL=postgres://todoapp@postgres/todos" --network codeshippythondjangotodoappv2_default codeshippythondjangotodoappv2_web.slim gunicorn -b 0.0.0.0:8000 todosapp.wsgi:application



Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/codeship-python-django-todoapp-v2/_dockerslim/slim.command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
here="$(dirname "$BASH_SOURCE")"
cd $here

docker-slim build --http-probe-cmd /todos/ --expose 8000 --network codeship-python-django-todoapp-v2_default --env 'DATABASE_URL=postgres://todoapp@postgres/todos' --cmd 'sh -c "sleep 7 && python manage.py migrate && gunicorn -b 0.0.0.0:8000 todosapp.wsgi:application"' codeship-python-django-todoapp-v2_web
docker-slim build --http-probe-cmd /todos/ --expose 8000 --network codeshippythondjangotodoappv2_default --env 'DATABASE_URL=postgres://todoapp@postgres/todos' --cmd 'sh -c "sleep 7 && python manage.py migrate && gunicorn -b 0.0.0.0:8000 todosapp.wsgi:application"' codeshippythondjangotodoappv2_web
1 change: 1 addition & 0 deletions 3rdparty/codeship-python-django-todoapp-v2/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ services:
environment:
POSTGRES_USER: todoapp
POSTGRES_DB: todos
POSTGRES_HOST_AUTH_METHOD: trust
4 changes: 2 additions & 2 deletions 3rdparty/codeship-python-django-todoapp/_dockerslim/clean.command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
here="$(dirname "$BASH_SOURCE")"
cd $here/..

docker rmi codeship-python-django-todoapp_web.slim
docker rmi codeship-python-django-todoapp_web
docker rmi codeshippythondjangotodoapp_web.slim
docker rmi codeshippythondjangotodoapp_web


3 changes: 2 additions & 1 deletion 3rdparty/codeship-python-django-todoapp/_dockerslim/docker-compose.slim.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3'
services:
web:
image: codeship-python-django-todoapp_web.slim
image: codeshippythondjangotodoapp_web.slim
depends_on:
- postgres
ports:
Expand All @@ -13,3 +13,4 @@ services:
environment:
POSTGRES_USER: todoapp
POSTGRES_DB: todos
POSTGRES_HOST_AUTH_METHOD: trust
2 changes: 1 addition & 1 deletion 3rdparty/codeship-python-django-todoapp/_dockerslim/run_app_only_slim.command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
here="$(dirname "$BASH_SOURCE")"
cd $here

docker run -it --rm --name="django_todo_app" -p 8000:8000 -e "DATABASE_URL=postgres://todoapp@postgres/todos" --network codeship-python-django-todoapp_default codeship-python-django-todoapp_web.slim
docker run -it --rm --name="django_todo_app" -p 8000:8000 -e "DATABASE_URL=postgres://todoapp@postgres/todos" --network codeshippythondjangotodoapp_default codeshippythondjangotodoapp_web.slim



Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/codeship-python-django-todoapp/_dockerslim/slim.command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
here="$(dirname "$BASH_SOURCE")"
cd $here

docker-slim build --http-probe-cmd /todos/ --expose 8000 --network codeship-python-django-todoapp_default --env 'DATABASE_URL=postgres://todoapp@postgres/todos' codeship-python-django-todoapp_web
docker-slim build --http-probe-cmd /todos/ --expose 8000 --network codeshippythondjangotodoapp_default --env 'DATABASE_URL=postgres://todoapp@postgres/todos' codeshippythondjangotodoapp_web
2 changes: 2 additions & 0 deletions 3rdparty/codeship-python-django-todoapp/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ services:
environment:
POSTGRES_USER: todoapp
POSTGRES_DB: todos
POSTGRES_HOST_AUTH_METHOD: trust

2 changes: 1 addition & 1 deletion 3rdparty/gabimelo-flask-boilerplate/_dockerslim/clean.command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
here="$(dirname "$BASH_SOURCE")"
cd $here/..

docker rmi gabimelo-flask-boilerplate_app.slim
docker rmi gabimeloflaskboilerplate_app.slim



2 changes: 1 addition & 1 deletion 3rdparty/gabimelo-flask-boilerplate/_dockerslim/docker-compose.slim.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3'
services:
app:
image: gabimelo-flask-boilerplate_app.slim
image: gabimeloflaskboilerplate_app.slim
ports:
- "5000:80"
# volumes:
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/gabimelo-flask-boilerplate/_dockerslim/run_app_only_slim.command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
here="$(dirname "$BASH_SOURCE")"
cd $here

docker run -it --rm --name="flask_nginx_app" -p 5000:80 --network gabimelo-flask-boilerplate_default gabimelo-flask-boilerplate_app.slim
docker run -it --rm --name="flask_nginx_app" -p 5000:80 --network gabimeloflaskboilerplate_default gabimeloflaskboilerplate_app.slim



2 changes: 1 addition & 1 deletion 3rdparty/gabimelo-flask-boilerplate/_dockerslim/slim.command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
here="$(dirname "$BASH_SOURCE")"
cd $here

docker-slim build --http-probe --expose 80 --network gabimelo-flask-boilerplate_default gabimelo-flask-boilerplate_app
docker-slim build --http-probe --expose 80 --network gabimeloflaskboilerplate_default gabimeloflaskboilerplate_app
2 changes: 1 addition & 1 deletion 3rdparty/gabimelo-flask-boilerplate/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ click==6.7
Flask==0.12.2
itsdangerous==0.24
Jinja2==2.10
MarkupSafe==1.0
MarkupSafe==1.1
pymongo==2.8
Werkzeug==0.14.1