Switch dockerfile that we use for travis.

.travis.yml

@@ -17,25 +17,8 @@ cache:
   - pip
 
 before_install:
-  # Confirm Docker version and login credentials
-  - docker --version
-  - echo -n "$DOCKER_PASSWORD" | docker login -u="$DOCKER_USERNAME" --password-stdin
+  - docker-compose -f docker-compose.yml -f docker-compose.travis.yml up -d
 
-  # Upgrade Docker
-  - sudo apt-get -y update
-  - sudo apt-get -y install -o Dpkg::Options::="--force-confnew" docker-ce
-  - docker --version
-
-  # Build the image.
-  - docker-compose build
-
-  # Ensure we have a place to store coverage output
-  - mkdir -p coverage
-
-  # Bring everything online
-  - make up-test
-
-# Do NOT install Python requirements.
 # Doing so is a waste of time since they won't be used.
 install: true
 
@@ -51,7 +34,3 @@ after_success:
   - pip install --upgrade codecov
   - make exec-coverage
   - codecov
-  - if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
-    echo -n "$DOCKER_PASSWORD" | docker login -u="$DOCKER_USERNAME" --password-stdin;
-    docker push edxops/credentials:devstack-slim;
-    fi

Dockerfile

@@ -1,13 +1,7 @@
-# docker build . -t edxops/credentials:devstack-slim
+FROM edxops/credentials:latest
 
-FROM edxops/python:3.5
-ENV PYTHONUNBUFFERED 1
-ENV DJANGO_SETTINGS_MODULE credentials.settings.devstack
-ENV ENABLE_DJANGO_TOOLBAR 1
-
-WORKDIR /edx/app/credentials/credentials
-
-# Iceweasel is the Debian name for Firefox
-RUN apt-get update && apt-get install -y \
-    iceweasel \
-    xvfb
+RUN apt-get update && \
+    apt-get install --no-install-recommends -y \
+        firefox \
+        xvfb \
+    && rm -rf /var/lib/apt/lists/*

Makefile

@@ -68,25 +68,25 @@ up-test: ## Bring up services for testing
 	docker-compose -f docker-compose.yml -f docker-compose.travis.yml up -d
 
 exec-validate-translations: ## Check translations on a container
-	docker exec -t credentials bash -c 'make validate_translations'
+	docker exec -t credentials bash -c 'source /edx/app/credentials/credentials_env && cd /edx/app/credentials/credentials/ && make validate_translations'
 
 exec-check_translations_up_to_date: ## test translations on a container
-	docker exec -t credentials bash -c 'make check_translations_up_to_date'
+	docker exec -t credentials bash -c 'source /edx/app/credentials/credentials_env && cd /edx/app/credentials/credentials/ && make check_translations_up_to_date'
 
 exec-clean: ## Remove all generated files from a container
-	docker exec -t credentials bash -c 'make clean'
+	docker exec -t credentials bash -c 'source /edx/app/credentials/credentials_env && cd /edx/app/credentials/credentials/ && make clean'
 
 exec-requirements:
-	docker exec -t credentials bash -c 'make requirements production-requirements'
+	docker exec -t credentials bash -c 'source /edx/app/credentials/credentials_env && cd /edx/app/credentials/credentials/ && make requirements && make production-requirements'
 
 exec-static: ## Gather static assets on a container
-	docker exec -t credentials bash -c 'make static'
+	docker exec -t credentials bash -c 'source /edx/app/credentials/credentials_env && cd /edx/app/credentials/credentials/ && make static'
 
 exec-quality: ## Run linters on a container
-	docker exec -t credentials bash -c 'make quality'
+	docker exec -t credentials bash -c 'source /edx/app/credentials/credentials_env && cd /edx/app/credentials/credentials/ && make quality'
 
 exec-tests: ## Run tests on a container
-	docker exec -it credentials bash -c 'xvfb-run make tests'
+	docker exec -it credentials bash -c 'source /edx/app/credentials/credentials_env && cd /edx/app/credentials/credentials/ && xvfb-run make tests'
 
 exec-validate: exec-validate-translations exec-clean exec-static exec-quality exec-tests ## Run linters and tests after checking translations and gathering static assets
 

docker-compose.travis.yml

@@ -18,3 +18,4 @@ services:
       - ENABLE_DJANGO_TOOLBAR=1
     volumes:
       - .:/edx/app/credentials/credentials
+      - /edx/app/credentials/credentials/node_modules