Merge lp://staging/~ricardokirkner/isitdeployable/docker into lp://staging/isitdeployable
Proposed by
Ricardo Kirkner
| Status: | Merged |
|---|---|
| Approved by: | Ricardo Kirkner |
| Approved revision: | 225 |
| Merge reported by: | Otto Co-Pilot |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~ricardokirkner/isitdeployable/docker |
| Merge into: | lp://staging/isitdeployable |
| Diff against target: |
1016 lines (+609/-176) 19 files modified
.bzrignore (+1/-1) .dockerignore (+2/-0) Dockerfile (+26/-0) Dockerfile.test (+4/-0) Makefile (+24/-21) Makefile.docker (+62/-0) README.docker (+35/-0) branches/wait-for-it/LICENSE (+20/-0) branches/wait-for-it/README.md (+69/-0) branches/wait-for-it/wait-for-it.sh (+161/-0) django_project/settings_base.py (+98/-149) django_project/settings_build.py (+12/-0) django_project/settings_devel.py (+17/-5) docker-compose.dev.yml (+24/-0) docker-compose.secrets.yml (+5/-0) docker-compose.test.yml (+9/-0) docker-compose.yml (+19/-0) requirements-docker.txt (+19/-0) requirements.txt (+2/-0) |
| To merge this branch: | bzr merge lp://staging/~ricardokirkner/isitdeployable/docker |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Guillermo Gonzalez | Approve | ||
|
Review via email:
|
|||
Commit message
added tooling to build and run application using docker
To post a comment you must log in.
Revision history for this message
| Otto Co-Pilot (otto-copilot) wrote | # |
Revision history for this message
| Otto Co-Pilot (otto-copilot) wrote | # |
Revision history for this message
| Otto Co-Pilot (otto-copilot) wrote | # |
Revision history for this message
| Otto Co-Pilot (otto-copilot) wrote | # |
Revision history for this message
| Otto Co-Pilot (otto-copilot) wrote | # |
Revision history for this message
| Otto Co-Pilot (otto-copilot) wrote | # |
Revision history for this message
| Otto Co-Pilot (otto-copilot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
besides the weird missing modules errors, it worked!