Skip to content

Commit

Permalink
Clean up from earlier experiments
Browse files Browse the repository at this point in the history
  • Loading branch information
benjaoming committed Aug 17, 2022
1 parent 0ac878a commit 3eda02d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 12 deletions.
6 changes: 0 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,9 @@ commands:
description: "Ensure built assets are up to date"
steps:
- checkout
# - setup_remote_docker
# - run: npm ci
- run: make docker-images
- run: make docker-run
- run: make docker-copy-assets
# - run: docker build -t sphinx_rtd_theme:latest .
# - run: docker run --cidfile=.container_id --mount type=bind,source="${CIRCLE_WORKING_DIRECTORY}/src",target=/project/src,readonly sphinx_rtd_theme:latest
# - run: docker cp "$(cat .container_id):/project/sphinx_rtd_theme" .
# - run: docker cp "$(cat .container_id):/project/package-lock.json" .
- run:
name: Ensure built assets are up to date
command: |
Expand Down
8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@ RUN mkdir -p /project/src/
WORKDIR /project

COPY package.json /project/
#COPY package-lock.json /project/

# COPY package-lock.json /project/

COPY bin/preinstall.js /project/bin/preinstall.js

RUN cd /project

# There is a very stubborn npm package that keeps complaining even though
# we try to set its environment config vars
# RUN ln -s `which python` /usr/bin/python3

RUN npm install --package-lock-only &&\
npm audit fix &&\
npm install
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"lato-font": "^3.0.0",
"mini-css-extract-plugin": "^0.6.0",
"node-sass": "^4.14.1",
"node-gyp": "^7.1.0",
"optimize-css-assets-webpack-plugin": "^5.0.4",
"roboto-fontface": "^0.10.0",
"sass-loader": "^7.3.0",
Expand Down

0 comments on commit 3eda02d

Please sign in to comment.