Skip to content

Commit

Permalink
Added TS config and better Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
Ehbraheem committed May 19, 2020
1 parent 3945209 commit bc0f228
Show file tree
Hide file tree
Showing 2 changed files with 142 additions and 19 deletions.
83 changes: 64 additions & 19 deletions scaffold/service/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
FROM node:10.16.3-alpine as build
FROM node:12.16.3-alpine as ts-build

# Arguments
ARG NPM_TOKEN
ARG NODE_ENV
ARG NPM_TOKEN
ENV NODE_ENV=$NODE_ENV \
SERVICE_PORT=$SERVICE_PORT \
APP_DIR="/usr/src/{{{scaffold_server_name}}}" \
YARN_CACHE="/tmp/ycache"

RUN mkdir -p $APP_DIR
RUN mkdir -p $YARN_CACHE

RUN apk --no-cache add \
bash \
Expand All @@ -17,38 +24,76 @@ RUN apk --no-cache add \

RUN apk add --no-cache --virtual .build-deps gcc zlib-dev libc-dev bsd-compat-headers py-setuptools bash

# Create app directory
ENV APP_DIR=/usr/src/api-medical-consultation
RUN mkdir -p $APP_DIR
WORKDIR $APP_DIR

WORKDIR $APP_DIR

# Install app dependencies
RUN echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
COPY package.json $APP_DIR
RUN yarn install --prod
COPY package* $APP_DIR
COPY yarn.lock $APP_DIR

# Setup configs and build dependencies
COPY . .
RUN yarn config set cache-folder $YARN_CACHE
RUN yarn install

# Bundle app source
COPY . .

# Compile TS to JS
RUN yarn build

# Production container
FROM node:10.16.3-alpine

FROM node:12.16.3-alpine as build

# Create app directory
ENV APP_DIR=/usr/src/api-medical-consultation \
YARN_CACHE="/tmp/ycache" \
NODE_ENV=$NODE_ENV \
NPM_TOKEN=$NPM_TOKEN

RUN mkdir -p $APP_DIR
RUN mkdir -p $YARN_CACHE


WORKDIR $APP_DIR

COPY --from=ts-build $APP_DIR/lib $APP_DIR/lib
COPY --from=ts-build $YARN_CACHE $YARN_CACHE
COPY --from=ts-build $APP_DIR/config $APP_DIR/config
COPY --from=ts-build $APP_DIR/package.json $APP_DIR/package.json
COPY --from=ts-build $APP_DIR/yarn.lock $APP_DIR/yarn.lock
COPY --from=ts-build $APP_DIR/.env $APP_DIR/.env

# Install app dependencies
RUN echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
RUN yarn install --prod --cache-folder $YARN_CACHE; rm -Rf $YARN_CACHE


# Production container
FROM node:12.16.2-alpine

# Arguments
ARG NODE_ENV

# Configuration
ENV SERVICE_PORT={{{scaffold_service_port}}} \
SERVICE_USER={{{scaffold_server_name}}} \
SERVICE_USER_ID=1001 \
SERVICE_GROUP={{{scaffold_server_name}}} \
SERVICE_GROUP_ID=1001 \
APP_DIR=/usr/src/{{{scaffold_server_name}}} \
NODE_ENV=$NODE_ENV

RUN mkdir -p $APP_DIR
WORKDIR $APP_DIR
RUN addgroup -g $SERVICE_GROUP_ID $SERVICE_GROUP \
&& adduser -D -u $SERVICE_USER_ID -G $SERVICE_GROUP $SERVICE_USER \
&& chown -R $SERVICE_USER:$SERVICE_GROUP $APP_DIR

USER $SERVICE_USER

COPY --chown=$SERVICE_USER:$SERVICE_GROUP --from=build $APP_DIR/ $APP_DIR/


COPY --from=build $APP_DIR/lib $APP_DIR/lib
COPY --from=build $APP_DIR/node_modules $APP_DIR/node_modules
COPY --from=build $APP_DIR/config $APP_DIR/config
COPY --from=build $APP_DIR/package.json $APP_DIR/package.json
COPY --from=build $APP_DIR/yarn.lock $APP_DIR/yarn.lock
COPY --from=build $APP_DIR/.env $APP_DIR/.env
EXPOSE $SERVICE_PORT

EXPOSE {{{scaffold_service_port}}}
CMD ["yarn", "start"]
78 changes: 78 additions & 0 deletions scaffold/service/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
{
"compilerOptions": {
/* Basic Options */
// "incremental": true, /* Enable incremental compilation */
"target": "ES2017", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
"lib": ["esnext.asynciterable", "es6", "ES2015"], /* Specify library files to be included in the compilation. */
"allowJs": true, /* Allow javascript files to be compiled. */
// "checkJs": true, /* Report errors in .js files. */
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
// "declaration": true, /* Generates corresponding '.d.ts' file. */
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
// "sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
"outDir": "./lib", /* Redirect output structure to the directory. */
"rootDir": "./src", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
// "removeComments": true, /* Do not emit comments to output. */
// "noEmit": true, /* Do not emit outputs. */
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */

/* Strict Type-Checking Options */
"strict": false, /* Enable all strict type-checking options. */
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* Enable strict null checks. */
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */

/* Additional Checks */
// "noUnusedLocals": true, /* Report errors on unused locals. */
// "noUnusedParameters": true, /* Report errors on unused parameters. */
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */

/* Module Resolution Options */
"moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
"baseUrl": "./", /* Base directory to resolve non-absolute module names. */
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
// "types": [], /* Type declaration files to be included in compilation. */
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */

/* Source Map Options */
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */

/* Experimental Options */
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */

/* Advanced Options */
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
},
"exclude": [
"node_modules",
"babel.config.js",
"src/**/*.test.*",
"src/**/*.spec.*",
"test",
"jest.config.js",
"rollup.config.js",
"lib",
"flow-typed",
"ecosystem.config.js"
]
}

0 comments on commit bc0f228

Please sign in to comment.