Skip to content

Commit

Permalink
Removes Makefile + double FROM in Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
benjaoming committed Aug 19, 2022
1 parent ba65499 commit d8f117e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 22 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
@@ -1,6 +1,4 @@
# python:3-alpine contains node 18 so has to go first
# in order to get overwritten
FROM python:3-alpine
# This implicitely includes Python 3.10
FROM node:14-alpine

# Do not use --update since that will also fetch the
Expand All @@ -10,7 +8,9 @@ RUN apk add npm make py3-pip py3-wheel

# Add an extra verification that we have the right node
# because the above caused issues
RUN node -v && node -v | grep -q v14
RUN python3 --version
RUN node -v && node -v | grep -q v14 &&\
python3 --version && python3 --version | grep -q "3.10"

RUN pip install pip --upgrade

Expand Down
12 changes: 0 additions & 12 deletions Makefile

This file was deleted.

10 changes: 4 additions & 6 deletions docs/contributing.rst
Expand Up @@ -82,18 +82,16 @@ Use the following steps:
.. code-block:: console
# Builds an updated version of the docker image
$ make docker-images
$ docker-compose build
# Runs the docker environment and builds the assets. The container exits after completing the build.
$ make docker-run command=build
$ docker-compose run sphinx_rtd_theme build
# Runs the development webserver
$ make docker-run command=dev
$ docker-compose run sphinx_rtd_theme dev
Every time you change the Node or Python requirements, you will need to rebuild images with ``make docker-images``. If you change SASS or JS, you will need to rebuild assets.

If you need a different setup, refer to ``Makefile`` to see the exact method used to invoke the Docker environment.
Every time you change the Node or Python requirements, you will need to rebuild images with ``docker-compose run sphinx_rtd_theme build``. If you change SASS or JS, you will need to rebuild assets.

Testing
=======
Expand Down

0 comments on commit d8f117e

Please sign in to comment.