Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Étienne Beaulé <[email protected]>
  • Loading branch information
2 people authored and philipbelesky committed May 14, 2022
1 parent 4267bb9 commit 492889c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ ADD . /tcd/
RUN git config --global url."https://".insteadOf git://

# Install our node/python requirements
RUN npm install -g [email protected]
RUN nvm use
RUN pip install pipenv
RUN pipenv install --system
RUN npm install --only=production
RUN npm ci --only=production

# Compile all the static files
RUN npm run build
Expand Down
4 changes: 2 additions & 2 deletions docs/install/linux.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Short version
Then create **settings/local.py** as described :ref:`below <local-settings-linux>`, then::

pipenv install
npm install
npm ci
pipenv shell

That should open your Pipenv shell, then inside it run::
Expand Down Expand Up @@ -182,7 +182,7 @@ a. Navigate to your Tabbycat directory::
b. Install the Python packages specified in the Pipfile using `Pipenv <https://pipenv.pypa.io/en/latest/>`_ (this also creates a virtual environment), and install the Node.js packages specified in package.json using `npm`::

$ pipenv install
$ npm install
$ npm ci

c. Navigate to the **tabbycat/settings** sub folder and copy **local.example** to **local.py**. Find this part in your new **local.py**, and fill in the blanks as indicated:

Expand Down
4 changes: 2 additions & 2 deletions docs/install/osx.rst
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,10 @@ b. Copy **settings/local.example** to **settings/local.py**. Find this part in y

TIME_ZONE = 'Australia/Melbourne'

c. Ensure you are in the main Tabbycat directory (not the config folder where **settings_local.py** is). IInstall the Python packages specified in the Pipfile using `Pipenv <https://pipenv.pypa.io/en/latest/>`_ (this also creates a virtual environment), and install the Node.js packages specified in package.json using `npm`::
c. Ensure you are in the main Tabbycat directory (not the config folder where **settings_local.py** is). Install the Python packages specified in the Pipfile using `Pipenv <https://pipenv.pypa.io/en/latest/>`_ (this also creates a virtual environment), and install the Node.js packages specified in package.json using `npm`::

$ pipenv install
$ npm install
$ npm ci

d. Start a Pipenv shell::

Expand Down
2 changes: 1 addition & 1 deletion docs/install/windows.rst
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ c. Install Pipenv. Then install the Python packages specified in the Pipfile usi

> pip install --user pipenv
> pipenv install
> npm install
> npm ci

.. attention:: If you get an error message saying that the script isn't digitally signed, open a PowerShell with administrator privileges by right-clicking PowerShell in the Start meny and clicking "Run as administrator". Then run this command::

Expand Down

0 comments on commit 492889c

Please sign in to comment.