Skip to content

Commit e5728f1

Browse files
temyerstemyers
authored
Merge branch 'master' into npm
2 parents 4e4440e + a730ac7 commit e5728f1

File tree

7 files changed

+3364
-7
lines changed

7 files changed

+3364
-7
lines changed

‎.travis.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
language: node_js
22
node_js:
3-
- "5.10"
3+
- "6.10"
44
- "4.4"
5+
sudo: required
56
services:
67
- docker
78
before_install:
89
- docker pull localstack/localstack
910
- docker run -d -p 4567-4582:4567-4582 -p 8080:8080 localstack/localstack
11+
- echo "127.0.0.1 localstack" | sudo tee -a /etc/hosts
1012
script:
1113
- npm run test
12-
- npm run integ
14+
# setup links for integration testing
15+
- npm link
16+
# FIXME - integration test fails first time, due to timing issue - S3 bucket does not exist after initial create stack completes.
17+
- npm run integ || npm run integ || npm run integ

‎Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM node:6.10
2+
3+
WORKDIR /app
4+
COPY . /app
5+
RUN yarn install
6+
7+
ENTRYPOINT '/bin/bash'

‎docker-compose.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
version: '2'
2+
services:
3+
dev-env:
4+
build:
5+
context: .
6+
working_dir: /app
7+
volumes:
8+
- .:/app
9+
- ~/.aws/:/root/.aws
10+
environment:
11+
- AWS_ACCESS_KEY_ID
12+
- AWS_SECRET_ACCESS_KEY
13+
- AWS_PROFILE
14+
- AWS_SESSION_TOKEN
15+
- AWS_SECURITY_TOKEN
16+
entrypoint:
17+
- /bin/bash
18+
localstack:
19+
image: localstack/localstack
20+
ports:
21+
- "4567-4582:4567-4582"
22+
- "8080:8080"
23+
environment:
24+
# Only start a subset of services required for testing.
25+
- SERVICES=s3,sns,sqs,apigateway,lambda,dynamodb,dynamodbstreams,cloudformation
26+
# - DEBUG=${DEBUG- }
27+
# - DATA_DIR=${DATA_DIR- }
28+
# - LAMBDA_EXECUTOR=${LAMBDA_EXECUTOR- }
29+
# - KINESIS_ERROR_PROBABILITY=${KINESIS_ERROR_PROBABILITY- }
30+
# - DOCKER_HOST=unix:///var/run/docker.sock
31+
# volumes:
32+
# - "${TMP_DIR:-/tmp/localstack}:${TMP_DIR:-/tmp/localstack}"
33+
# - "/var/run/docker.sock:/var/run/docker.sock"

0 commit comments

Comments
 (0)