Skip to content

Commit 5d6d8da

Browse files
evereqevereq
authored
Merge pull request #1310 from ever-co/develop
Release
2 parents 2028c32 + 607e574 commit 5d6d8da

File tree

3,811 files changed

+165971
-155315
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,811 files changed

+165971
-155315
lines changed

‎.circleci/config.yml

+191-101
Large diffs are not rendered by default.

‎.deploy/admin-web-angular/Dockerfile

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
FROM node:alpine AS development
2+
3+
RUN apk update \
4+
&& apk add libexecinfo libexecinfo-dev \
5+
&& npm i -g npm \
6+
&& apk --no-cache add --virtual builds-deps build-base \
7+
snappy g++ snappy-dev gcc libgcc libstdc++ linux-headers autoconf automake make nasm python git \
8+
&& npm install --quiet node-gyp -g \
9+
&& npm config set python /usr/bin/python \
10+
&& npm install yarn -g --force
11+
12+
RUN mkdir /srv/ever && chown node:node /srv/ever
13+
14+
USER node
15+
16+
WORKDIR /srv/ever
17+
18+
COPY --chown=node:node package.json yarn.lock lerna.json package.workspaces.json ./
19+
COPY --chown=node:node packages/admin-web-angular/package.json ./packages/admin-web-angular/package.json
20+
COPY --chown=node:node .snyk ./.snyk
21+
COPY --chown=node:node packages/common ./packages/common
22+
COPY --chown=node:node packages/common-angular ./packages/common-angular
23+
24+
RUN yarn install
25+
26+
FROM node:alpine AS production
27+
28+
RUN npm install cross-env -g
29+
30+
RUN mkdir /srv/ever && chown node:node /srv/ever
31+
RUN mkdir -p /srv/ever/packages/admin-web-angular && chown node:node /srv/ever/packages/admin-web-angular
32+
RUN mkdir -p /srv/ever/packages/common && chown node:node /srv/ever/packages/common
33+
RUN mkdir -p /srv/ever/packages/common-angular && chown node:node /srv/ever/packages/common-angular
34+
35+
USER node
36+
37+
WORKDIR /srv/ever
38+
39+
ARG NODE_OPTIONS="--max-old-space-size=2048"
40+
ENV NODE_OPTIONS $NODE_OPTIONS
41+
ENV NODE_ENV production
42+
43+
COPY --from=development --chown=node:node /srv/ever/node_modules ./node_modules
44+
COPY --from=development --chown=node:node /srv/ever/packages/common/node_modules ./packages/common/node_modules
45+
COPY --from=development --chown=node:node /srv/ever/packages/common-angular/node_modules ./packages/common-angular/node_modules
46+
COPY --from=development --chown=node:node /srv/ever/packages/admin-web-angular/node_modules ./packages/admin-web-angular/node_modules
47+
COPY --chown=node:node package.json yarn.lock lerna.json package.workspaces.json tsconfig.base.json ./
48+
COPY --chown=node:node packages/common ./packages/common
49+
COPY --chown=node:node packages/common-angular ./packages/common-angular
50+
COPY --chown=node:node packages/admin-web-angular ./packages/admin-web-angular

‎.deploy/carrier-mobile-ionic/Dockerfile

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
FROM node:alpine AS development
2+
3+
RUN apk update \
4+
&& apk add libexecinfo libexecinfo-dev \
5+
&& npm i -g npm \
6+
&& apk --no-cache add --virtual builds-deps build-base \
7+
snappy g++ snappy-dev gcc libgcc libstdc++ linux-headers autoconf automake make nasm python git \
8+
&& npm install --quiet node-gyp -g \
9+
&& npm config set python /usr/bin/python \
10+
&& npm install yarn -g --force
11+
12+
RUN mkdir /srv/ever && chown node:node /srv/ever
13+
14+
USER node
15+
16+
WORKDIR /srv/ever
17+
18+
COPY --chown=node:node package.json yarn.lock lerna.json package.workspaces.json ./
19+
COPY --chown=node:node packages/carrier-mobile-ionic/package.json ./packages/carrier-mobile-ionic/package.json
20+
COPY --chown=node:node .snyk ./.snyk
21+
COPY --chown=node:node packages/common ./packages/common
22+
COPY --chown=node:node packages/common-angular ./packages/common-angular
23+
24+
RUN yarn install
25+
26+
FROM node:alpine AS production
27+
28+
RUN npm install cross-env -g
29+
30+
RUN mkdir /srv/ever && chown node:node /srv/ever
31+
RUN mkdir -p /srv/ever/packages/carrier-mobile-ionic && chown node:node /srv/ever/packages/carrier-mobile-ionic
32+
RUN mkdir -p /srv/ever/packages/common && chown node:node /srv/ever/packages/common
33+
RUN mkdir -p /srv/ever/packages/common-angular && chown node:node /srv/ever/packages/common-angular
34+
35+
USER node
36+
37+
WORKDIR /srv/ever
38+
39+
ARG NODE_OPTIONS="--max-old-space-size=2048"
40+
ENV NODE_OPTIONS $NODE_OPTIONS
41+
ENV NODE_ENV production
42+
43+
COPY --from=development --chown=node:node /srv/ever/node_modules ./node_modules
44+
COPY --from=development --chown=node:node /srv/ever/packages/common/node_modules ./packages/common/node_modules
45+
COPY --from=development --chown=node:node /srv/ever/packages/common-angular/node_modules ./packages/common-angular/node_modules
46+
COPY --from=development --chown=node:node /srv/ever/packages/carrier-mobile-ionic/node_modules ./packages/carrier-mobile-ionic/node_modules
47+
COPY --chown=node:node package.json yarn.lock lerna.json package.workspaces.json tsconfig.base.json ./
48+
COPY --chown=node:node packages/common ./packages/common
49+
COPY --chown=node:node packages/common-angular ./packages/common-angular
50+
COPY --chown=node:node packages/carrier-mobile-ionic ./packages/carrier-mobile-ionic

‎.deploy/core/Dockerfile

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# API
2+
3+
FROM node:alpine AS development
4+
5+
RUN apk update \
6+
&& apk add libexecinfo libexecinfo-dev \
7+
&& npm i -g npm \
8+
&& apk --no-cache add --virtual builds-deps build-base \
9+
snappy g++ snappy-dev gcc libgcc libstdc++ linux-headers autoconf automake make nasm python git \
10+
&& npm install --quiet node-gyp -g \
11+
&& npm config set python /usr/bin/python \
12+
&& npm install yarn -g --force
13+
14+
RUN mkdir /srv/ever && chown node:node /srv/ever
15+
16+
USER node
17+
18+
WORKDIR /srv/ever
19+
20+
COPY --chown=node:node package.json yarn.lock lerna.json package.workspaces.json ./
21+
COPY --chown=node:node packages/core/package.json ./packages/core/package.json
22+
COPY --chown=node:node .snyk ./.snyk
23+
COPY --chown=node:node packages/core/.snyk ./packages/core/.snyk
24+
COPY --chown=node:node packages/common ./packages/common
25+
26+
RUN yarn install
27+
28+
FROM node:alpine AS production
29+
30+
ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.6.0/wait /wait
31+
32+
RUN npm install cross-env -g \
33+
&& npm install pm2 -g --unsafe-perm \
34+
&& chmod +x /wait
35+
36+
RUN mkdir /srv/ever && chown node:node /srv/ever
37+
RUN mkdir -p /srv/ever/packages/core && chown node:node /srv/ever/packages/core
38+
RUN mkdir -p /srv/ever/packages/common && chown node:node /srv/ever/packages/common
39+
40+
USER node
41+
42+
WORKDIR /srv/ever
43+
44+
ARG NODE_OPTIONS="--max-old-space-size=2048"
45+
ENV NODE_OPTIONS $NODE_OPTIONS
46+
ENV NODE_ENV production
47+
48+
COPY --from=development --chown=node:node /srv/ever/node_modules ./node_modules
49+
COPY --from=development --chown=node:node /srv/ever/packages/core/node_modules ./packages/core/node_modules
50+
COPY --chown=node:node package.json yarn.lock lerna.json package.workspaces.json tsconfig.base.json ./
51+
COPY --chown=node:node packages/common ./packages/common
52+
COPY --chown=node:node packages/core ./packages/core
53+
54+
EXPOSE 5500 5501 5050 5555
55+
56+
CMD /wait \
57+
&& yarn --cwd ./packages/common build && yarn run:server

‎.deploy/merchant-tablet-ionic/Dockerfile

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
FROM node:alpine AS development
2+
3+
RUN apk update \
4+
&& apk add libexecinfo libexecinfo-dev \
5+
&& npm i -g npm \
6+
&& apk --no-cache add --virtual builds-deps build-base \
7+
snappy g++ snappy-dev gcc libgcc libstdc++ linux-headers autoconf automake make nasm python git \
8+
&& npm install --quiet node-gyp -g \
9+
&& npm config set python /usr/bin/python \
10+
&& npm install yarn -g --force
11+
12+
RUN mkdir /srv/ever && chown node:node /srv/ever
13+
14+
USER node
15+
16+
WORKDIR /srv/ever
17+
18+
COPY --chown=node:node package.json yarn.lock lerna.json package.workspaces.json ./
19+
COPY --chown=node:node packages/merchant-tablet-ionic/package.json ./packages/merchant-tablet-ionic/package.json
20+
COPY --chown=node:node .snyk ./.snyk
21+
COPY --chown=node:node packages/common ./packages/common
22+
COPY --chown=node:node packages/common-angular ./packages/common-angular
23+
24+
RUN yarn install
25+
26+
FROM node:alpine AS production
27+
28+
RUN npm install cross-env -g
29+
30+
RUN mkdir /srv/ever && chown node:node /srv/ever
31+
RUN mkdir -p /srv/ever/packages/merchant-tablet-ionic && chown node:node /srv/ever/packages/merchant-tablet-ionic
32+
RUN mkdir -p /srv/ever/packages/common && chown node:node /srv/ever/packages/common
33+
RUN mkdir -p /srv/ever/packages/common-angular && chown node:node /srv/ever/packages/common-angular
34+
35+
USER node
36+
37+
WORKDIR /srv/ever
38+
39+
ARG NODE_OPTIONS="--max-old-space-size=2048"
40+
ENV NODE_OPTIONS $NODE_OPTIONS
41+
ENV NODE_ENV production
42+
43+
COPY --from=development --chown=node:node /srv/ever/node_modules ./node_modules
44+
COPY --from=development --chown=node:node /srv/ever/packages/common/node_modules ./packages/common/node_modules
45+
COPY --from=development --chown=node:node /srv/ever/packages/common-angular/node_modules ./packages/common-angular/node_modules
46+
COPY --from=development --chown=node:node /srv/ever/packages/merchant-tablet-ionic/node_modules ./packages/merchant-tablet-ionic/node_modules
47+
COPY --chown=node:node package.json yarn.lock lerna.json package.workspaces.json tsconfig.base.json ./
48+
COPY --chown=node:node packages/common ./packages/common
49+
COPY --chown=node:node packages/common-angular ./packages/common-angular
50+
COPY --chown=node:node packages/merchant-tablet-ionic ./packages/merchant-tablet-ionic

‎.deploy/shop-mobile-ionic/Dockerfile

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
FROM node:alpine AS development
2+
3+
RUN apk update \
4+
&& apk add libexecinfo libexecinfo-dev \
5+
&& npm i -g npm \
6+
&& apk --no-cache add --virtual builds-deps build-base \
7+
snappy g++ snappy-dev gcc libgcc libstdc++ linux-headers autoconf automake make nasm python git \
8+
&& npm install --quiet node-gyp -g \
9+
&& npm config set python /usr/bin/python \
10+
&& npm install yarn -g --force
11+
12+
RUN mkdir /srv/ever && chown node:node /srv/ever
13+
14+
USER node
15+
16+
WORKDIR /srv/ever
17+
18+
COPY --chown=node:node package.json yarn.lock lerna.json package.workspaces.json ./
19+
COPY --chown=node:node packages/shop-mobile-ionic/package.json ./packages/shop-mobile-ionic/package.json
20+
COPY --chown=node:node .snyk ./.snyk
21+
COPY --chown=node:node packages/common ./packages/common
22+
COPY --chown=node:node packages/common-angular ./packages/common-angular
23+
24+
RUN yarn install
25+
26+
FROM node:alpine AS production
27+
28+
RUN npm install cross-env -g
29+
30+
RUN mkdir /srv/ever && chown node:node /srv/ever
31+
RUN mkdir -p /srv/ever/packages/shop-mobile-ionic && chown node:node /srv/ever/packages/shop-mobile-ionic
32+
RUN mkdir -p /srv/ever/packages/common && chown node:node /srv/ever/packages/common
33+
RUN mkdir -p /srv/ever/packages/common-angular && chown node:node /srv/ever/packages/common-angular
34+
35+
USER node
36+
37+
WORKDIR /srv/ever
38+
39+
ARG NODE_OPTIONS="--max-old-space-size=2048"
40+
ENV NODE_OPTIONS $NODE_OPTIONS
41+
ENV NODE_ENV production
42+
43+
COPY --from=development --chown=node:node /srv/ever/node_modules ./node_modules
44+
COPY --from=development --chown=node:node /srv/ever/packages/common/node_modules ./packages/common/node_modules
45+
COPY --from=development --chown=node:node /srv/ever/packages/common-angular/node_modules ./packages/common-angular/node_modules
46+
COPY --from=development --chown=node:node /srv/ever/packages/shop-mobile-ionic/node_modules ./packages/shop-mobile-ionic/node_modules
47+
COPY --chown=node:node package.json yarn.lock lerna.json package.workspaces.json tsconfig.base.json ./
48+
COPY --chown=node:node packages/common ./packages/common
49+
COPY --chown=node:node packages/common-angular ./packages/common-angular
50+
COPY --chown=node:node packages/shop-mobile-ionic ./packages/shop-mobile-ionic

‎.deploy/shop-web-angular/Dockerfile

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
FROM node:alpine AS development
2+
3+
RUN apk update \
4+
&& apk add libexecinfo libexecinfo-dev \
5+
&& npm i -g npm \
6+
&& apk --no-cache add --virtual builds-deps build-base \
7+
snappy g++ snappy-dev gcc libgcc libstdc++ linux-headers autoconf automake make nasm python git \
8+
&& npm install --quiet node-gyp -g \
9+
&& npm config set python /usr/bin/python \
10+
&& npm install yarn -g --force
11+
12+
RUN mkdir /srv/ever && chown node:node /srv/ever
13+
14+
USER node
15+
16+
WORKDIR /srv/ever
17+
18+
COPY --chown=node:node package.json yarn.lock lerna.json package.workspaces.json ./
19+
COPY --chown=node:node packages/shop-web-angular/package.json ./packages/shop-web-angular/package.json
20+
COPY --chown=node:node .snyk ./.snyk
21+
COPY --chown=node:node packages/common ./packages/common
22+
COPY --chown=node:node packages/common-angular ./packages/common-angular
23+
24+
RUN yarn install
25+
26+
FROM node:alpine AS production
27+
28+
RUN npm install cross-env -g
29+
30+
RUN mkdir /srv/ever && chown node:node /srv/ever
31+
RUN mkdir -p /srv/ever/packages/shop-web-angular && chown node:node /srv/ever/packages/shop-web-angular
32+
RUN mkdir -p /srv/ever/packages/common && chown node:node /srv/ever/packages/common
33+
RUN mkdir -p /srv/ever/packages/common-angular && chown node:node /srv/ever/packages/common-angular
34+
35+
USER node
36+
37+
WORKDIR /srv/ever
38+
39+
ARG NODE_OPTIONS="--max-old-space-size=2048"
40+
ENV NODE_OPTIONS $NODE_OPTIONS
41+
ENV NODE_ENV production
42+
43+
COPY --from=development --chown=node:node /srv/ever/node_modules ./node_modules
44+
COPY --from=development --chown=node:node /srv/ever/packages/common/node_modules ./packages/common/node_modules
45+
COPY --from=development --chown=node:node /srv/ever/packages/common-angular/node_modules ./packages/common-angular/node_modules
46+
COPY --from=development --chown=node:node /srv/ever/packages/shop-web-angular/node_modules ./packages/shop-web-angular/node_modules
47+
COPY --chown=node:node package.json yarn.lock lerna.json package.workspaces.json tsconfig.base.json ./
48+
COPY --chown=node:node packages/common ./packages/common
49+
COPY --chown=node:node packages/common-angular ./packages/common-angular
50+
COPY --chown=node:node packages/shop-web-angular ./packages/shop-web-angular

‎.gitignore

+9-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/dist
33
/tmp
44
/out-tsc
5+
/build
56

67
# dependencies
78
/node_modules
@@ -29,6 +30,7 @@
2930
/libpeerconnection.log
3031
npm-debug.log
3132
yarn-debug.log
33+
yarn-error.log
3234
testem.log
3335
/typings
3436

@@ -41,6 +43,11 @@ testem.log
4143
Thumbs.db
4244
/admin/website-angular/yarn-error.log
4345

44-
yarn.lock
45-
/yarn-error.log
4646
*.lerna_backup
47+
48+
/packages/core/tsconfig.build.tsbuildinfo
49+
/packages/common-angular/*.tsbuildinfo
50+
/packages/admin-web-angular/*.tsbuildinfo
51+
/packages/common/*.tsbuildinfo
52+
/packages/core/*.tsbuildinfo
53+
/packages/shop-mobile-ionic/package-lock.json

‎.gitpod.yml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
tasks:
2+
- init: yarn install && yarn run build
3+
command: yarn run watch

‎.travis.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ node_js:
1212
cache:
1313
directories:
1414
- node_modules
15-
- backend/api/node_modules
16-
- admin/website-angular/node_modules
17-
- carrier/mobile-ionic/node_modules
18-
- shop/mobile-ionic/node_modules
19-
- shop/website-angular/node_modules
20-
- merchant/tablet-ionic/node_modules
15+
- packages/core/node_modules
16+
- packages/admin-web-angular/node_modules
17+
- packages/carrier-mobile-ionic/node_modules
18+
- packages/shop-mobile-ionic/node_modules
19+
- packages/shop-web-angular/node_modules
20+
- packages/merchant-tablet-ionic/node_modules
2121

2222
addons:
2323
apt:
@@ -40,12 +40,12 @@ install:
4040

4141
matrix:
4242
include:
43-
# - env: PROJECT=backend/api
44-
# - env: PROJECT=admin/website-angular
45-
# - env: PROJECT=carrier/mobile-ionic
46-
# - env: PROJECT=shop/mobile-ionic
47-
# - env: PROJECT=shop/website-angular
48-
# - env: PROJECT=merchant/tablet-ionic
43+
- env: PROJECT=packages/core
44+
- env: PROJECT=packages/admin-web-angular
45+
- env: PROJECT=packages/carrier-mobile-ionic
46+
- env: PROJECT=packages/shop-mobile-ionic
47+
- env: PROJECT=packages/shop-web-angular
48+
- env: PROJECT=packages/merchant-tablet-ionic
4949

5050
before_script:
5151
- cd $PROJECT

0 commit comments

Comments
 (0)