Skip to content

Commit 83e1220

Browse files
committed
Removes Makefile + double FROM in Dockerfile
1 parent ba65499 commit 83e1220

File tree

4 files changed

+8
-23
lines changed

4 files changed

+8
-23
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,3 @@ sphinx_rtd_theme/static/js/html5shiv.min.js
2727
sphinx_rtd_theme/static/js/html5shiv-printshiv.min.js
2828
.direnv/
2929
.envrc
30-
.container_id

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# python:3-alpine contains node 18 so has to go first
2-
# in order to get overwritten
3-
FROM python:3-alpine
1+
# This implicitely includes Python 3.10
42
FROM node:14-alpine
53

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

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

1515
RUN pip install pip --upgrade
1616

Makefile

Lines changed: 0 additions & 12 deletions
This file was deleted.

docs/contributing.rst

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,16 @@ Use the following steps:
8282
.. code-block:: console
8383
8484
# Builds an updated version of the docker image
85-
$ make docker-images
85+
$ docker-compose build
8686
8787
# Runs the docker environment and builds the assets. The container exits after completing the build.
88-
$ make docker-run command=build
88+
$ docker-compose run sphinx_rtd_theme build
8989
9090
# Runs the development webserver
91-
$ make docker-run command=dev
91+
$ docker-compose run sphinx_rtd_theme dev
9292
9393
94-
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.
95-
96-
If you need a different setup, refer to ``Makefile`` to see the exact method used to invoke the Docker environment.
94+
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.
9795

9896
Testing
9997
=======

0 commit comments

Comments
 (0)