Skip to content

Commit

Permalink
Use pre-built docker image for development and CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrey Fedoseev committed Feb 10, 2018
1 parent 92c7b21 commit 784a851
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 24 deletions.
17 changes: 4 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,12 @@ jobs:
build:
working_directory: ~/django-static-precompiler
docker:
- image: ubuntu:16.04
- image: andreyfedoseev/django-static-precompiler
steps:
- run: apt-get update && apt-get install -y python2.7-dev python3.5-dev python3-pip sqlite3 ruby-dev npm
- run: ln -s /usr/bin/nodejs /usr/local/bin/node
- run: npm install -g [email protected]
- run: npm install -g [email protected]
- run: npm install -g [email protected]
- run: npm install -g [email protected]
- run: npm install -g [email protected]
- run: npm install -g [email protected]
- run: gem install sass -v 3.4.22
- run: gem install compass -v 1.0.1
- run: apt-get update && apt-get install -y python2.7-dev python3.5-dev python-pip sqlite3
- checkout
- run: pip3 install -r requirements-ci.txt
- run: pip3 install -e .[libsass]
- run: pip install -r requirements-ci.txt
- run: pip install -e .[libsass]
- run: flake8
- run: rm -f coverage.xml
- run: tox
Expand Down
13 changes: 2 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
FROM ubuntu:16.04
FROM andreyfedoseev/django-static-precompiler
MAINTAINER Andrey Fedoseev <[email protected]>
RUN apt-get update && apt-get install -y python2.7-dev python3.5-dev python-pip sqlite3 ruby-dev npm
RUN ln -s /usr/bin/nodejs /usr/local/bin/node
RUN npm install -g [email protected]
RUN npm install -g [email protected]
RUN npm install -g [email protected]
RUN npm install -g [email protected]
RUN npm install -g [email protected]
RUN npm install -g [email protected]
RUN gem install sass -v 3.4.22
RUN gem install compass -v 1.0.1
RUN apt-get update && apt-get install -y python2.7-dev python3.5-dev python-pip sqlite3
RUN mkdir /app
WORKDIR /app
ADD requirements-*.txt /app/
Expand Down
12 changes: 12 additions & 0 deletions Dockerfile-base
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
FROM ubuntu:16.04
MAINTAINER Andrey Fedoseev <[email protected]>
RUN apt-get update && apt-get install -y autoconf libtool ruby-dev npm
RUN ln -s /usr/bin/nodejs /usr/local/bin/node
RUN npm install -g [email protected]
RUN npm install -g [email protected]
RUN npm install -g [email protected]
RUN npm install -g [email protected]
RUN npm install -g [email protected]
RUN npm install -g [email protected]
RUN gem install sass -v 3.4.22
RUN gem install compass -v 1.0.1

0 comments on commit 784a851

Please sign in to comment.