Skip to content
This repository has been archived by the owner on May 24, 2024. It is now read-only.

Commit

Permalink
Consume new docker images (#981)
Browse files Browse the repository at this point in the history
* test new docker images

* consume released docker images
  • Loading branch information
mjhenkes authored and ryanthemanuel committed Dec 9, 2019
1 parent a271ff3 commit ddde347
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
mkdir -p $HOME/docker && docker images -a --filter='dangling=false' --format '{{.Repository}}:{{.Tag}} {{.ID}}'
| xargs -n 2 -t sh -c 'test -e $HOME/docker/$1.tar.gz || docker save $0 | gzip -2 > $HOME/docker/$1.tar.gz'
- stage: danger lint and jest
script: "travis_wait docker-compose run -e DANGER_GITHUB_API_TOKEN=$DANGER_GITHUB_API_TOKEN -e HAS_JOSH_K_SEAL_OF_APPROVAL=$HAS_JOSH_K_SEAL_OF_APPROVAL -e TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST -e TRAVIS_REPO_SLUG=$TRAVIS_REPO_SLUG test-ci bash -c 'npm run danger && npm run lint && npm run jest'"
script: "travis_wait docker-compose run -e DANGER_GITHUB_API_TOKEN=$DANGER_GITHUB_API_TOKEN -e HAS_JOSH_K_SEAL_OF_APPROVAL=$HAS_JOSH_K_SEAL_OF_APPROVAL -e TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST -e TRAVIS_REPO_SLUG=$TRAVIS_REPO_SLUG test-ci sh -c 'npm run danger && npm run lint && npm run jest'"
- stage: compile - default theme
script: travis_wait docker-compose run test-ci npm run compile:prod
- stage: wdio - default theme
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# use terra-node as base image
FROM cerner/terra-node
FROM cerner/terra-node-ci:1
31 changes: 10 additions & 21 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,6 @@
version: '3'

services:
dev: &dev
image: "terra-framework:dev"
build:
context: ./
args:
- npm_install=false
ports:
- 8080:8080
environment:
- CI=true
depends_on:
- standalone-chrome
volumes:
- .:/opt/module

standalone-chrome:
image: 'selenium/standalone-chrome:3.14.0-helium'
ports:
Expand All @@ -27,18 +12,22 @@ services:
environment:
TZ: 'America/Chicago'

term:
<<: *dev
command: "/bin/zsh"
dev:
image: cerner/terra-node-dev:1
ports:
- 8080:8080
depends_on:
- standalone-chrome
volumes:
- .:/opt/module

test-ci:
build: ./
image: "${DOCKER_IMAGE}-test-standalone-chrome:${TAG:-latest}"
image: "${DOCKER_IMAGE}-test:${TAG:-latest}"
environment:
- CI=true
- SITE=build
volumes:
- $HOME/$TRAVIS_BUILD_ID/build:/opt/module/build
depends_on:
- standalone-chrome
command: 'npm run wdio-default'
command: 'npm run wdio-default'

0 comments on commit ddde347

Please sign in to comment.