Skip to content

Commit

Permalink
Fixes following Tai's feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
jmurty committed Mar 6, 2018
1 parent 2f953a2 commit c8bf62c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/commands.rst
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Actions:
``.env.$DOTENV.secret``, and ``.env.local`` (again) when those files exist
* If the PostgreSQL DB name ``PGDATABASE`` environment variable is not set,
derive it from one of the following in, order of preference:
* ``$PROJECT_NAME_<Git Commit SHA>`` if a Git repository is present
* ``$PROJECT_NAME_<Git branch>`` if a Git repository is present
* ``$PROJECT_NAME_$DOTENV`` if ``DOTENV`` is set
* ``$PROJECT_NAME`` if neither of the two situations above holds.
* Pass through or set sensible default values for PostgreSQL and Redis
Expand Down
4 changes: 0 additions & 4 deletions docs/how-tos.rst
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,6 @@ How to dockerize an existing project

* Run ``pip-compile -v``, resolving any conflicts that may arise.

* Re-derive your ``requirements.txt`` file from ``requirements.in`` with::

$ pip-compile --output-file requirements.txt requirements.in

* Make ``go.sh`` executable::

$ chmod 755 go.sh
Expand Down
4 changes: 4 additions & 0 deletions ixc_django_docker/bin/bash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ For more info on each script, run:
help.sh
See more detailed documentation about commands at:
https://github.com/ixc/ixc-django-docker/docs/commands.rst
EOF

export PS1="($PROJECT_NAME) \u@\h:\w\\$ "
Expand Down
4 changes: 4 additions & 0 deletions ixc_django_docker/bin/help.sh
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,8 @@ Here is a list of frequently used commands you might want to run:
waitlock.py [-b] <COMMAND>
Serialize the execution of a command with a Redis lock.
See more detailed documentation about commands at:
https://github.com/ixc/ixc-django-docker/docs/commands.rst
EOF

0 comments on commit c8bf62c

Please sign in to comment.