refactor(oauth): combine oauth deps and package.json with auth

Fixes #2748

.circleci/config.yml

@@ -94,15 +94,11 @@ jobs:
 
       - run:
           name: Build deployment container image
-          command: cd fxa-oauth-server && docker build -f Dockerfile-build -t fxa-oauth-server:build .
-
-      - run:
-          name: Check npm install
-          command: cd fxa-oauth-server && docker run --rm -it fxa-oauth-server:build npm ls --production
+          command: docker build -f Dockerfile-oauth-build -t fxa-oauth-server:build .
 
       - run:
           name: Build test container image
-          command: cd fxa-oauth-server && docker build -f Dockerfile-test -t fxa-oauth-server:test .
+          command: docker build -f Dockerfile-oauth-test -t fxa-oauth-server:test .
 
       - run:
           name: Run MySQL
@@ -111,11 +107,11 @@ jobs:
 
       - run:
           name: Run Memory DB Tests
-          command: cd fxa-oauth-server && docker run fxa-oauth-server:test npm test
+          command: docker run fxa-oauth-server:test npm run test-oauth
 
       - run:
           name: Run MySQL DB Tests
-          command: cd fxa-oauth-server && docker run --net=host -p 3306:3306 -e DB="mysql" fxa-oauth-server:test npm test
+          command: docker run --net=host -p 3306:3306 -e DB="mysql" fxa-oauth-server:test npm run test-oauth
 
       - run:
           name: Push to Dockerhub

.dockerignore

@@ -1,2 +1 @@
 .git
-fxa-oauth-server

.travis.yml

@@ -75,11 +75,11 @@ jobs:
     node_js: 8
     <<: *fxa-oauth-memory-test
     install:
-      - cd fxa-oauth-server && npm ci && cd ..
-    script: cd fxa-oauth-server && npm test
+      - npm ci
+    script: npm run test-oauth
   - stage:
     node_js: 8
     <<: *fxa-oauth-memory-test
     install:
-      - cd fxa-oauth-server && npm ci && cd ..
-    script: cd fxa-oauth-server && npm test
+      - npm ci
+    script: npm run test-oauth

fxa-oauth-server/Dockerfile-build → Dockerfile-oauth-build

@@ -2,7 +2,7 @@ FROM node:8-alpine AS builder
 
 RUN npm install -g npm@6 && rm -rf ~app/.npm /tmp/*
 
-RUN apk add --no-cache git && \
+RUN apk add --no-cache git linux-headers openssl && \
     apk add --repository http://dl-cdn.alpinelinux.org/alpine/v3.5/community/ --no-cache --virtual .build-deps git python make g++
 
 RUN addgroup -g 10001 app && \
@@ -18,7 +18,8 @@ USER app
 
 COPY npm-shrinkwrap.json npm-shrinkwrap.json
 COPY package.json package.json
-COPY scripts/gen_keys.js scripts/gen_keys.js
+COPY scripts/download_l10n.sh scripts/download_l10n.sh
+COPY fxa-oauth-server/scripts/gen_keys.js fxa-oauth-server/scripts/gen_keys.js
 
 RUN npm install --production && rm -rf ~app/.npm /tmp/*
 
@@ -30,7 +31,7 @@ FROM node:8-alpine
 
 RUN npm install -g npm@6 && rm -rf ~app/.npm /tmp/*
 
-RUN apk add --no-cache git
+RUN apk add --no-cache git make gcc g++ linux-headers openssl python
 
 RUN addgroup -g 10001 app && \
     adduser -D -G app -h /app -u 10001 app

Dockerfile-oauth-test

@@ -0,0 +1,8 @@
+FROM fxa-oauth-server:build
+
+USER root
+RUN rm -rf /app/node_modules
+RUN rm -rf /app/fxa-content-server-l10n
+
+USER app
+RUN npm ci

fxa-oauth-server/lib/routes/root.js

@@ -5,7 +5,7 @@
 const exec = require('child_process').exec;
 const path = require('path');
 
-const version = require('../../package.json').version;
+const version = require('../../../package.json').version;
 var commitHash, source;
 
 // See if config/version.json exists (part of rpm builds)