wee cleanup

Author: trioletas

Dockerfile

@@ -1,6 +1,6 @@
 # Prepare
 
-FROM node:8.9.3-alpine AS base
+FROM node:8.9.4-alpine AS base
 
 RUN mkdir -p /opt/app
 

Dockerfile.dev

@@ -1,6 +1,6 @@
 # Prepare
 
-FROM node:8.9.3-alpine
+FROM node:8.9.4-alpine
 
 RUN mkdir -p /opt/app
 
@@ -17,4 +17,6 @@ RUN yarn
 
 COPY . /opt/app
 
+ENV NODE_ENV development
+
 ENTRYPOINT ["yarn"]

README.md

@@ -63,19 +63,16 @@ Attention windows users: when `Docker for Windows` is not an option, install `ya
 
 - npm: `$ npm run test:unit`
 - yarn: `$ yarn test:unit`
-- Docker: `$ docker-compose -f docker-compose.test.yml run sut test:unit`
 
 ### Run integration tests
 
 - npm: `$ npm run test:integration`
 - yarn: `$ yarn test:integration`
-- Docker: `$ docker-compose -f docker-compose.test.yml run sut test:integration`
 
 ### Run all tests
 
 - npm: `$ npm test`
 - yarn: `$ yarn test`
-- Docker: `$ docker-compose -f docker-compose.test.yml run sut`
 
 ### Generate coverage reports
 

docker-compose.test.yml

@@ -10,3 +10,5 @@ services:
  - ./server:/opt/app/server
  ports:
  - 3001:3001
+ environment:
+ - SHELL=/bin/sh 

docker-compose.yml

@@ -19,5 +19,4 @@ module.exports = Object.assign(
  "testEnvironment": "node",
  },
  process.env.CI ? require('./ci.partial.config.js') : {}
-)
-;
+);

jest/default.config.js

@@ -9,7 +9,6 @@ const env = envalid.cleanEnv(process.env, {
  PLAYGROUND: bool({ default: true }),
  CORS: bool({ devDefault: true, default: false }),
  GRAPHQL_TRACING: bool({ default: true }),
- NODE_ENV: str({ devDefault: 'development' }),
  LOG_LEVEL: str({ default: 'info' }),
 });
 

server/env.ts

@@ -76,4 +76,3 @@ describe('query.joke', () => {
  expect({ data, errors }).toMatchSnapshot();
  });
 });
-