Use pre-built docker image for development and CI

Andrey Fedoseev · Andrey Fedoseev · commit d2d64c7e140e · 2018-02-10T13:42:21.000-08:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -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 coffee-script@1.7.1
-      - run: npm install -g livescript@1.4.0
-      - run: npm install -g less@1.7.4
-      - run: npm install -g babel-cli@6.2.0
-      - run: npm install -g stylus@0.50.0
-      - run: npm install -g handlebars@4.0.2
-      - 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
diff --git a/Dockerfile b/Dockerfile
@@ -1,15 +1,6 @@
-FROM ubuntu:16.04
+FROM andreyfedoseev/django-static-precompiler
 MAINTAINER Andrey Fedoseev <andrey.fedoseev@gmail.com>
-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 coffee-script@1.7.1
-RUN npm install -g livescript@1.4.0
-RUN npm install -g less@1.7.4
-RUN npm install -g babel-cli@6.2.0
-RUN npm install -g stylus@0.50.0
-RUN npm install -g handlebars@4.0.2
-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/
diff --git a/Dockerfile-base b/Dockerfile-base
@@ -0,0 +1,12 @@
+FROM ubuntu:16.04
+MAINTAINER Andrey Fedoseev <andrey.fedoseev@gmail.com>
+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 coffee-script@1.7.1
+RUN npm install -g livescript@1.4.0
+RUN npm install -g less@1.7.4
+RUN npm install -g babel-cli@6.2.0
+RUN npm install -g stylus@0.50.0
+RUN npm install -g handlebars@4.0.2
+RUN gem install sass -v 3.4.22
+RUN gem install compass -v 1.0.1
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -1,3 +1,4 @@
+Django<2.0
 pytest
 pytest-django==3.1.2
 pretend

-Original file 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
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+Django<2.0`
`1`	`2`	`pytest`
`2`	`3`	`pytest-django==3.1.2`
`3`	`4`	`pretend`