diff options
| author | Benjamin Bach <benjamin@overtag.dk> | 2022-08-20 01:37:34 +0300 |
|---|---|---|
| committer | Benjamin Bach <benjamin@overtag.dk> | 2022-08-20 01:38:26 +0300 |
| commit | 83e122054cf0cda8ad6bf0af3ad3f809d4f2f322 (patch) | |
| tree | bda1a30ae996aaed31de9c4c872542497f1e3ea7 | |
| parent | ba65499354ab73a8223c89e1f3ec77b9bf278a63 (diff) | |
Removes Makefile + double FROM in Dockerfile
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Dockerfile | 8 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | docs/contributing.rst | 10 |
4 files changed, 8 insertions, 23 deletions
@@ -27,4 +27,3 @@ sphinx_rtd_theme/static/js/html5shiv.min.js sphinx_rtd_theme/static/js/html5shiv-printshiv.min.js .direnv/ .envrc -.container_id @@ -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 @@ -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 diff --git a/Makefile b/Makefile deleted file mode 100644 index 5a7757b..0000000 --- a/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -SHELL := /bin/bash -CWD := $(shell cd -P -- '$(shell dirname -- "$0")' && pwd -P) - -docker-images: - docker-compose build - -docker-run: - docker-compose run sphinx_rtd_theme $(command) - -docker-copy-assets: - docker cp "$(shell cat .container_id):/project/sphinx_rtd_theme" . - docker cp "$(shell cat .container_id):/project/package-lock.json" . diff --git a/docs/contributing.rst b/docs/contributing.rst index 47858b4..d46631e 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -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 ======= |