Commit 7dc5b31d authored by Ruslan Konviser's avatar Ruslan Konviser
Browse files

fix: some more Docker related fixes

parent c5a8c977

.deploy/api/Dockerfile

+10 −8
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ ARG NODE_ENV 
ARG API_BASE_URL

ARG API_HOST

ARG API_PORT

ARG SENTRY_DSN

ARG DB_URI

ARG DB_HOST

ARG DB_NAME
@@ -17,7 +18,7 @@ ARG DEMO 
ARG HOST

ARG PORT



FROM node:alpine AS dependencies

FROM node:16-alpine3.11 AS dependencies



LABEL maintainer="ever@ever.co"
@@ -25,8 +26,8 @@ ENV CI=true 


RUN apk --update add bash \

	&& apk add libexecinfo libexecinfo-dev \

	&& apk --no-cache add --virtual builds-deps build-base \

	snappy dos2unix g++ snappy-dev gcc libgcc libstdc++ linux-headers autoconf automake make nasm python vips-dev git \

	&& apk add --no-cache --virtual build-dependencies build-base \

	snappy dos2unix g++ snappy-dev gcc libgcc libstdc++ linux-headers autoconf automake make nasm python2 py2-setuptools vips-dev git \

	&& npm install --quiet node-gyp -g \

	&& npm config set python /usr/bin/python \

	&& mkdir /srv/ever && chown -R node:node /srv/ever
@@ -40,13 +41,13 @@ WORKDIR /srv/ever 


COPY --chown=node:node package.json yarn.lock lerna.json package.workspaces.json tsconfig.base.json ./

COPY --chown=node:node packages/core/package.json ./packages/core/package.json

COPY --chown=node:node packages/common/package.json ./packages/common/package.json

COPY --chown=node:node .snyk ./.snyk

COPY --chown=node:node packages/core/.snyk ./packages/core/.snyk

COPY --chown=node:node packages/common ./packages/common



RUN yarn install --frozen-lockfile && yarn cache clean

RUN yarn bootstrap && yarn cache clean



FROM node:alpine AS development

FROM node:16-alpine3.11 AS development



USER node:node
@@ -56,7 +57,7 @@ COPY --chown=node:node --from=dependencies /wait /entrypoint.compose.sh /entrypo 
COPY --chown=node:node --from=dependencies /srv/ever .

COPY . .



FROM node:alpine AS build

FROM node:16-alpine3.11 AS build



WORKDIR /srv/ever
@@ -72,7 +73,7 @@ ENV IS_DOCKER=true 


RUN yarn build:server



FROM node:alpine AS production

FROM node:16-alpine3.11 AS production



WORKDIR /srv/ever
@@ -112,6 +113,7 @@ ENV NODE_ENV=${NODE_ENV:-production} 
ENV API_HOST=${API_HOST:-api}

ENV API_PORT=${API_PORT:-5500}

ENV API_BASE_URL=${API_BASE_URL:-http://localhost:5500}

ENV SENTRY_DSN=${SENTRY_DSN}

ENV DB_URI=${DB_URI:-mongodb://localhost/ever_development}

ENV DB_HOST=${DB_HOST:-localhost}

ENV DB_NAME=${DB_NAME:-ever_development}

.vscode/settings.json

+2 −0
Original line number Diff line number Diff line
@@ -76,12 +76,14 @@ 
		"KEYMETRICS",

		"LINKEDIN",

		"logpath",

		"microservices",

		"MIXPANEL",

		"mongod",

		"mongodb",

		"Progressbar",

		"pyro",

		"snyk",

		"typedoc",

		"typeorm",

		"Whitespaces"

	],

package.json

+12 −11
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
	},

	"scripts": {

		"prepare:husky": "npx husky install .husky",

		"bootstrap": "yarn install && yarn lerna bootstrap",

		"build": "yarn run build:common && yarn lerna run --parallel build",

		"bootstrap": "yarn install --frozen-lockfile && yarn lerna bootstrap",

		"build": "yarn run build:common && yarn run build:common:angular && yarn lerna run --parallel build",

		"watch": "yarn lerna run --parallel watch",

		"clean": "yarn lerna run clean",

		"pub": "yarn lerna publish",
@@ -31,21 +31,22 @@ 
		"lint": "yarn tslint --fix",

		"start:api": "yarn run:server",

		"run:ncu": "yarn ncu --configFileName=.ncurc.json --configFilePath=./",

		"run:server": "yarn run build:common && yarn --cwd ./packages/core run build && yarn --cwd ./packages/core run start",

		"run:server": "yarn run build:server && yarn --cwd ./packages/core run start",

		"run:server:dev": "yarn --cwd ./packages/core start:dev",

		"run:admin": "yarn --cwd ./packages/admin-web-angular start",

		"run:merchant": "yarn --cwd ./packages/merchant-tablet-ionic start",

		"run:shopmobile": "yarn --cwd ./packages/shop-mobile-ionic start",

		"run:shopweb": "yarn --cwd ./packages/shop-web-angular start",

		"run:carrier": "yarn --cwd ./packages/carrier-mobile-ionic start",

		"build:server": "yarn run build:common && yarn --cwd ./packages/core run build",

		"build:common": "yarn --cwd ./packages/common build && yarn --cwd ./packages/common-angular build",

		"build:admin": "yarn run build:common && yarn --cwd ./packages/admin-web-angular run build",

		"build:merchant": "yarn run build:common && yarn --cwd ./packages/merchant-tablet-ionic run build",

		"build:shopmobile": "yarn run build:common && yarn --cwd ./packages/shop-mobile-ionic run build",

		"build:shopweb": "yarn run build:common && yarn --cwd ./packages/shop-web-angular run build",

		"build:carrier": "yarn run build:common && yarn --cwd ./packages/carrier-mobile-ionic run build",

		"build:all": "yarn run build:common && yarn run build:server && yarn run build:admin && yarn run build:merchant && yarn run build:shopmobile && yarn run build:shopweb && yarn run build:carrier",

		"build:server": "yarn run build:common && yarn lerna run build --scope @ever-platform/core",

		"build:common": "yarn lerna run build --scope @ever-platform/common",

		"build:common:angular": "yarn lerna run build --scope @ever-platform/common-angular",

		"build:admin": "yarn run build:common && yarn run build:common:angular && yarn lerna run build --scope @ever-platform/admin-web-angular",

		"build:merchant": "yarn run build:common && yarn run build:common:angular && yarn lerna run build --scope @ever-platform/merchant-tablet-ionic",

		"build:shopmobile": "yarn run build:common && yarn run build:common:angular && yarn lerna run build --scope @ever-platform/shop-mobile-ionic",

		"build:shopweb": "yarn run build:common && yarn run build:common:angular && yarn lerna run build --scope @ever-platform/shop-web-angular",

		"build:carrier": "yarn run build:common && yarn run build:common:angular && yarn lerna run build --scope @ever-platform/carrier-mobile-ionic",

		"build:all": "yarn run build:common && yarn run build:common:angular && yarn run build:server && yarn run build:admin && yarn run build:merchant && yarn run build:shopmobile && yarn run build:shopweb && yarn run build:carrier",

		"tslint-check": "tslint-config-prettier-check ./tslint.json",

		"count": "cross-env yarn cloc packages/core/src packages/shop-web-angular/src packages/carrier-mobile-ionic/src packages/shop-web-angular/src packages/shop-mobile-ionic/src packages/merchant-tablet-ionic/src packages/common-angular packages/common --exclude-dir='node_modules,modules'",

		"snyk-protect": "snyk protect"

packages/admin-web-angular/.dockerignore

+3 −1
Original line number Diff line number Diff line
@@ -5,4 +5,6 @@ README.md 
docker

node_modules

tmp

build

dist

.env
 
 No newline at end of file

packages/carrier-mobile-ionic/.dockerignore

+3 −1
Original line number Diff line number Diff line
@@ -5,4 +5,6 @@ README.md 
docker

node_modules

tmp

build

dist

.env