cleanup

Author: trioletas

Dockerfile

@@ -1,45 +1,48 @@
 # Prepare
-
-FROM node:8.9.4-alpine AS base
-
-RUN mkdir -p /opt/app
+FROM node:8.11.0-alpine AS base
 
 WORKDIR /opt/app
 
 # Install
-
 FROM base AS dependencies
 
-COPY package.json .
-COPY yarn.lock .
+COPY package.json yarn.lock ./
 
 RUN yarn --production --ignore-scripts --prefer-offline
 RUN cp -R node_modules production_node_modules
+
 RUN yarn
 
 # Build
-
 FROM base AS build
 
-COPY --from=dependencies /opt/app/node_modules /opt/node_modules
-ENV PATH /opt/node_modules/.bin:$PATH
+COPY --from=dependencies /opt/app/node_modules ./node_modules
+
+ENV CI true
+COPY tsconfig.json tslint.json ./
 
-COPY . /opt/app
+COPY src ./src
+
+COPY package.json .
 
 RUN yarn build
 
-# Run
+# Test
+COPY jest.config.js .
+COPY jest ./jest
 
+RUN yarn test
+
+# Run
 FROM base AS run
 
 COPY --from=dependencies /opt/app/production_node_modules ./node_modules
-COPY --from=build /opt/app .
+COPY --from=dependencies /opt/app/package.json .
+COPY --from=build /opt/app/build ./build
 
 ENV PORT 3001
 ENV NODE_ENV production
 
-HEALTHCHECK CMD curl -fs http://$HOST:$PORT/healthz || exit 1
-
 EXPOSE $PORT
 
 USER node

Dockerfile.dev

@@ -1,15 +1,12 @@
 # Prepare
 
-FROM node:8.9.4-alpine
-
-RUN mkdir -p /opt/app
+FROM node:8.11.0-alpine
 
 WORKDIR /opt/app
 
 # Install
 
-COPY package.json .
-COPY yarn.lock .
+COPY package.json yarn.lock ./
 
 RUN yarn
 

docker-compose.yml

@@ -7,8 +7,8 @@ services:
  context: .
  dockerfile: Dockerfile.dev
  volumes:
- - ./server:/opt/app/server
+ - ./src:/opt/app/src
  ports:
  - 3001:3001
  environment:
- - SHELL=/bin/sh 
+ - SHELL=/bin/sh

jest/__setup__/env-test.ts

@@ -1,3 +1,3 @@
 // read env to be accessible on every test (used in integration tests)
-import env from '../../server/env';
+import env from '../../src/env';
 process.env = env;

package.json

@@ -10,13 +10,13 @@
  "test:integration": "npm run validate:env && jest --config jest/integration.config.js",
  "test:unit": "npm run validate:env && jest --config jest/unit.config.js",
  "test:all": "npm run validate:env && jest",
- "lint": "tslint -t stylish 'server/**/*.ts'",
- "lint:watch": "chokidar \"server/**/*.ts\" -c \"tslint -t stylish --force '{path}'\"",
- "validate:env": "tsc server/env.ts --lib esnext --esModuleInterop --outDir ./build/ && node ./build/env.js",
+ "lint": "tslint -t stylish 'src/**/*.ts'",
+ "lint:watch": "chokidar \"src/**/*.ts\" -c \"tslint -t stylish --force '{path}'\"",
+ "validate:env": "tsc src/env.ts --lib esnext --esModuleInterop --outDir ./build/ && node ./build/env.js",
  "clean": "rimraf build",
  "clean:graphql": "rimraf build/**/*.{gql,graphql,graphqls}",
- "copy:graphql": "cpx \"server/**/*.{gql,graphql,graphqls}\" build",
- "copy:graphql:watch": "chokidar \"./server/**/*.{gql,graphql,graphqls}\" -c \"npm run clean:graphql && npm run copy:graphql && touch server/server.ts\"",
+ "copy:graphql": "cpx \"src/**/*.{gql,graphql,graphqls}\" build",
+ "copy:graphql:watch": "chokidar \"./src/**/*.{gql,graphql,graphqls}\" -c \"npm run clean:graphql && npm run copy:graphql && touch src/server.ts\"",
  "docker-mount": "docker-share mount -t"
  },
  "engines": {

server/env.ts

@@ -9,16 +9,19 @@ import koaMiddleware from 'graphql-voyager/middleware/koa';
 const koaPlayground = require('graphql-playground-middleware-koa').default;
 import { promisifyAll } from 'bluebird';
 import { Client } from 'flashheart';
-import { graphqlPath, graphiqlPath, voyagerPath, playgroundPath } from './paths';
 import schema from './graphql/schema';
 import logger from './logger';
+import { entryPoint } from './entrypoint';
 
 promisifyAll(Client.prototype);
 
 const app = new koa();
 
 const router = new koaRouter();
 
+// Entry Point
+router.get('/', entryPoint);
+
 // CORS?
 if (process.env.CORS) {
  app.use(koaConvert(koaCors()));
@@ -35,13 +38,13 @@ const graphqlMiddleware = graphqlKoa({
  },
 });
 
-router.post(`/${graphqlPath}*`, koaBodyparser(), graphqlMiddleware);
-router.get(`/${graphqlPath}*`, graphqlMiddleware);
+router.post(`/${process.env.GRAPHQL_ENDPOINT}*`, koaBodyparser(), graphqlMiddleware);
+router.get(`/${process.env.GRAPHQL_ENDPOINT}*`, graphqlMiddleware);
 
 // GraphQL Voyager?
 if (process.env.VOYAGER) {
- router.all(`/${voyagerPath}`, koaMiddleware({
- endpointUrl: `/${graphqlPath}`,
+ router.all(`/${process.env.VOYAGER_ENDPOINT}`, koaMiddleware({
+ endpointUrl: `/${process.env.GRAPHQL_ENDPOINT}`,
  displayOptions: {
  sortByAlphabet: true,
  },
@@ -50,21 +53,21 @@ if (process.env.VOYAGER) {
 
 // GraphiQL?
 if (process.env.GRAPHIQL) {
- router.get(`/${graphiqlPath}`, graphiqlKoa({ endpointURL: `/${graphqlPath}` }));
+ router.get(`/${process.env.GRAPHIQL_ENDPOINT}`, graphiqlKoa({ endpointURL: `/${process.env.GRAPHQL_ENDPOINT}` }));
 }
 
 // GraphQL Playground?
 if (process.env.PLAYGROUND) {
  router.all(
- `/${playgroundPath}`,
+ `/${process.env.PLAYGROUND_ENDPOINT}`,
  koaPlayground({
- endpoint: `/${graphqlPath}`,
+ endpoint: `/${process.env.GRAPHQL_ENDPOINT}`,
  }),
  );
 }
 
 // Koa Heartbeat
-app.use(koaHeartbeat({ path: '/healthz', body: 'up!' }));
+app.use(koaHeartbeat({ path: `/${process.env.LIVENESS_ENDPOINT}`, body: 'ok' }));
 
 app.use(router.routes());
 app.use(router.allowedMethods());

server/paths.ts

@@ -5,7 +5,7 @@ import { Joke, JokeCategoryValues } from '../graphql/types/jokes';
 const http = createClient({ logger });
 
 const getRandomJokeByCategory = async (category: JokeCategoryValues): Promise<any> => {
- const uri = `${process.env.JOKE_SERVICE_URI}/jokes/random${category ? `?limitTo=[${category.toLowerCase()}]` : ''}`;
+ const uri = `${process.env.JOKE_SERVICE_URL}/jokes/random${category ? `?limitTo=[${category.toLowerCase()}]` : ''}`;
 
  const { value } = await http.getAsync(uri);
 

server/app.ts renamed to src/app.ts

@@ -0,0 +1,34 @@
+import path from 'path';
+import fs from 'fs';
+import { pickBy, identity, isEmpty } from 'lodash';
+
+const endpointsConfig = {
+ graphql: `${process.env.SELF_URL}/${process.env.GRAPHQL_ENDPOINT}`,
+ liveness: `${process.env.SELF_URL}/${process.env.LIVENESS_ENDPOINT}`,
+ graphiql: process.env.GRAPHIQL && `${process.env.SELF_URL}/${process.env.GRAPHIQL_ENDPOINT}`,
+ playground: process.env.PLAYGROUND && `${process.env.SELF_URL}/${process.env.PLAYGROUND_ENDPOINT}`,
+ voyager: process.env.VOYAGER && `${process.env.SELF_URL}/${process.env.VOYAGER_ENDPOINT}`,
+};
+
+const packageJsonPath = path.resolve('package.json');
+let packageJson: any = {};
+
+if (fs.existsSync(packageJsonPath)) {
+ packageJson = require(packageJsonPath);
+}
+
+const entryPointConfig: any = {
+ name: packageJson.name,
+ description: packageJson.description,
+ repository: packageJson.repository,
+ endpoints: pickBy(endpointsConfig, identity),
+};
+
+
+const entryPoint = async (ctx) => {
+ ctx.body = entryPointConfig;
+};
+
+export {
+ entryPoint,
+};