Skip to content

Commit 5b10a4a

Browse files
committed
Fix testing and pushing
1 parent 5abafaa commit 5b10a4a

File tree

7 files changed

+30
-15
lines changed

7 files changed

+30
-15
lines changed

Diff for: .buildkite/pipeline.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,12 @@ steps:
22
- label: ":mocha:"
33
plugins:
44
docker-compose#v2.0.0:
5-
run: test
5+
run: linter
6+
- wait
7+
- label: ":docker:"
8+
branches: master fix-tests
9+
plugins:
10+
docker-compose#v2.0.0:
11+
config: docker-compose.prod.yml
12+
push:
13+
- linter:buildkite/plugin-linter

Diff for: .dockerignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/node_modules
2+
/.git

Diff for: Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM node:9-alpine
22
WORKDIR /src
3-
ENV PATH=$PATH:/src/bin:/src/node_modules/.bin NODE_ENV=production PLUGIN_PATH=/plugin
3+
ENV PATH=$PATH:/src/bin NODE_ENV=production PLUGIN_PATH=/plugin
44
ADD . /src/
55
RUN npm -s install
66
ENTRYPOINT ["lint"]

Diff for: Dockerfile.dev

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM node:9-alpine
2+
WORKDIR /src
3+
ENV PATH=$PATH:/src/bin PLUGIN_PATH=/plugin
4+
ADD . /src/
5+
RUN npm -s install

Diff for: README.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ bin/lint --help
3232
If not, you can use [Docker Compose](https://docs.docker.com/compose/):
3333

3434
```bash
35-
docker-compose run test
36-
docker-compose run lint --help
35+
# Run the tests
36+
docker-compose run linter
37+
# Run the lint command
38+
docker-compose run linter lint --help
3739
```
3840

3941
## Roadmap

Diff for: docker-compose.prod.yml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
version: '3.2'
2+
services:
3+
linter:
4+
build: .

Diff for: docker-compose.yml

+5-11
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
version: '3.2'
22
services:
3-
lint:
4-
build: .
5-
volumes:
6-
# Mount these in so we pick up edits in dev, without having to re-build
7-
- "./bin:/src/bin"
8-
- "./lib:/src/lib"
9-
test:
10-
build: .
3+
linter:
4+
build:
5+
context: .
6+
dockerfile: Dockerfile.dev
117
volumes:
128
# Mount these in so we pick up edits in dev, without having to re-build
139
- "./bin:/src/bin"
1410
- "./lib:/src/lib"
1511
- "./test:/src/test"
16-
entrypoint:
17-
- npm
18-
- test
12+
command: npm test

0 commit comments

Comments
 (0)