Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Col/gaurhari #344

Open
wants to merge 116 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
e4a23c4
Dockerising & describe the deployments, services
glmanhtu May 14, 2019
f4d867d
Add Jenkinsfile
glmanhtu May 15, 2019
349d66c
Optimise CD flow
glmanhtu May 17, 2019
9033af3
Update ingresses
glmanhtu May 23, 2019
7310396
Merge branch 'dev' into features/cloud-migration
glmanhtu May 23, 2019
3796108
Temporary disable e2e tests since we don't have enough memory to run
glmanhtu May 23, 2019
7550185
Merge branch 'features/cloud-migration' of github.com:OmicsDI/ddi-web…
glmanhtu May 23, 2019
64f67ca
Merge pull request #301 from OmicsDI/features/cloud-migration
glmanhtu May 23, 2019
3395835
Removing unnecessary file
glmanhtu May 24, 2019
856d60d
Increased version
glmanhtu May 24, 2019
b4f984f
Update k8s, preserve original client's ip
glmanhtu May 24, 2019
c323ece
Test get client's real ip
glmanhtu May 24, 2019
eb0030e
Remove unnecessary code
glmanhtu May 24, 2019
11fae8d
Merge branch 'dev' into features/cloud-migration
glmanhtu May 24, 2019
02bf077
Merge pull request #302 from OmicsDI/features/cloud-migration
glmanhtu May 24, 2019
2abbfb0
Test
glmanhtu May 24, 2019
be02aa1
Merge branch 'dev' into features/cloud-migration
glmanhtu May 24, 2019
88809a9
Merge pull request #304 from OmicsDI/features/cloud-migration
glmanhtu May 24, 2019
94d062e
Test
glmanhtu May 28, 2019
f98798e
Merge branch 'dev' into features/cloud-migration
glmanhtu May 28, 2019
3ad3809
Merge pull request #305 from OmicsDI/features/cloud-migration
glmanhtu May 28, 2019
a1188ca
test
glmanhtu May 28, 2019
2e75abd
Merge branch 'dev' into features/cloud-migration
glmanhtu May 28, 2019
a13b7fc
Merge pull request #306 from OmicsDI/features/cloud-migration
glmanhtu May 28, 2019
70b608d
Test
glmanhtu May 28, 2019
e9c7f5b
Merge branch 'features/cloud-migration' of github.com:OmicsDI/ddi-web…
glmanhtu May 28, 2019
a508625
Merge branch 'dev' into features/cloud-migration
glmanhtu May 28, 2019
0a43eae
Merge pull request #307 from OmicsDI/features/cloud-migration
glmanhtu May 28, 2019
610f61e
Test CD
glmanhtu May 28, 2019
d6a0e06
Merge branch 'features/cloud-migration' of github.com:OmicsDI/ddi-web…
glmanhtu May 28, 2019
2aa41f3
Merge branch 'dev' into features/cloud-migration
glmanhtu May 28, 2019
d2f3af5
Merge pull request #308 from OmicsDI/features/cloud-migration
glmanhtu May 28, 2019
ecc6410
Test CD
glmanhtu May 28, 2019
11dabfb
Merge branch 'dev' into features/cloud-migration
glmanhtu May 28, 2019
d6b7d6a
Merge pull request #309 from OmicsDI/features/cloud-migration
glmanhtu May 28, 2019
e203ca9
Optimise ingress
glmanhtu May 28, 2019
bdb57c1
Merge branch 'features/cloud-migration' of github.com:OmicsDI/ddi-web…
glmanhtu May 28, 2019
0bee4a4
Update dev server
glmanhtu Jun 6, 2019
5445953
Merge branch 'dev' into features/cloud-migration
glmanhtu Jun 6, 2019
e623a5e
Merge pull request #310 from OmicsDI/features/cloud-migration
glmanhtu Jun 6, 2019
ca19089
Fixed ingress incorrected
glmanhtu Jun 6, 2019
c9b78bb
Merge branch 'features/cloud-migration' of github.com:OmicsDI/ddi-web…
glmanhtu Jun 6, 2019
ca43741
Merge branch 'dev' into features/cloud-migration
glmanhtu Jun 6, 2019
7472f45
Merge pull request #311 from OmicsDI/features/cloud-migration
glmanhtu Jun 6, 2019
633628c
Update profilews
glmanhtu Jun 10, 2019
6c2b853
Merge branch 'features/cloud-migration' of github.com:OmicsDI/ddi-web…
glmanhtu Jun 10, 2019
9b35166
Merge branch 'dev' into features/cloud-migration
glmanhtu Jun 10, 2019
d50ae8b
Merge pull request #312 from OmicsDI/features/cloud-migration
glmanhtu Jun 10, 2019
26291cd
Fixed issue of redirecting back to 8080 port
glmanhtu Jun 10, 2019
a54b1e5
Merge branch 'features/cloud-migration' of github.com:OmicsDI/ddi-web…
glmanhtu Jun 10, 2019
bb64dcb
Merge branch 'dev' into features/cloud-migration
glmanhtu Jun 10, 2019
9f85e3c
Merge pull request #313 from OmicsDI/features/cloud-migration
glmanhtu Jun 10, 2019
8ccc2f9
Ignore AOT in dev
glmanhtu Jun 10, 2019
bf0a162
Merge branch 'dev' into features/cloud-migration
glmanhtu Jun 10, 2019
8378e59
Merge pull request #314 from OmicsDI/features/cloud-migration
glmanhtu Jun 10, 2019
d528808
Optimise code
glmanhtu Jun 10, 2019
fcc1241
Merge branch 'features/cloud-migration' of github.com:OmicsDI/ddi-web…
glmanhtu Jun 10, 2019
76922f4
Merge branch 'dev' into features/cloud-migration
glmanhtu Jun 10, 2019
bf3b607
Merge pull request #315 from OmicsDI/features/cloud-migration
glmanhtu Jun 10, 2019
6c924be
Optimise code
glmanhtu Jun 10, 2019
b1c154d
Merge branch 'features/cloud-migration' of github.com:OmicsDI/ddi-web…
glmanhtu Jun 10, 2019
74ac03f
Merge branch 'dev' into features/cloud-migration
glmanhtu Jun 10, 2019
1f0a67f
Optimise code
glmanhtu Jun 10, 2019
c9fa0b0
Merge pull request #316 from OmicsDI/features/cloud-migration
glmanhtu Jun 10, 2019
bf54c8a
Fixed Oauth while list problem
glmanhtu Jun 10, 2019
9c1e181
Merge branch 'dev' into features/cloud-migration
glmanhtu Jun 10, 2019
850be14
Merge pull request #317 from OmicsDI/features/cloud-migration
glmanhtu Jun 10, 2019
8ae9184
Added help button for rosette chart
glmanhtu Jun 12, 2019
3764644
Merge branch 'features/cloud-migration' of github.com:OmicsDI/ddi-web…
glmanhtu Jun 12, 2019
7ad7791
Merge branch 'dev' into features/cloud-migration
glmanhtu Jun 12, 2019
3a35ab9
Merge pull request #318 from OmicsDI/features/cloud-migration
glmanhtu Jun 12, 2019
7af14ba
Merge branch 'dev' into features/database-names
glmanhtu Jun 19, 2019
a14418e
Merge pull request #320 from OmicsDI/features/database-names
glmanhtu Jun 19, 2019
b06d491
Added local kubernetes configuration
glmanhtu Jun 19, 2019
efd49bc
Fix issue with server side rendering - clipboard module
glmanhtu Jun 24, 2019
c69a11c
Merge branch 'dev' into features/cloud-migration
glmanhtu Jun 24, 2019
3438e4f
Merge pull request #321 from OmicsDI/features/cloud-migration
glmanhtu Jun 24, 2019
7f92bea
Fix server side rendering for search page
glmanhtu Jun 24, 2019
e8c6afb
Merge branch 'features/cloud-migration' of github.com:OmicsDI/ddi-web…
glmanhtu Jun 24, 2019
6135202
Merge branch 'dev' into features/cloud-migration
glmanhtu Jun 24, 2019
1299b31
Merge pull request #322 from OmicsDI/features/cloud-migration
glmanhtu Jun 24, 2019
42e8400
Merge branch 'dev' into hotfix/connection-scale
glmanhtu Jul 10, 2019
9f5eb91
Merge pull request #324 from OmicsDI/hotfix/connection-scale
glmanhtu Jul 10, 2019
0af8a34
Merge branch 'dev' into hotfix/labhead
glmanhtu Aug 15, 2019
807fdd8
Merge pull request #328 from OmicsDI/hotfix/labhead
glmanhtu Aug 15, 2019
f4556be
Fixed dataset not found issue
glmanhtu Sep 11, 2019
18c4b76
Merge pull request #329 from OmicsDI/features/cloud-migration
glmanhtu Sep 11, 2019
3850a1b
Fixed SSR requestAnimationFrame is not defined
glmanhtu Sep 11, 2019
b83eb52
Merge branch 'dev' into features/cloud-migration
glmanhtu Sep 11, 2019
8369486
Merge pull request #330 from OmicsDI/features/cloud-migration
glmanhtu Sep 11, 2019
33b5bb2
Handle getting schema err
glmanhtu Sep 11, 2019
a1dd998
Merge branch 'features/cloud-migration' of github.com:OmicsDI/ddi-web…
glmanhtu Sep 11, 2019
4421123
Merge branch 'dev' into features/cloud-migration
glmanhtu Sep 11, 2019
10f2394
Merge pull request #331 from OmicsDI/features/cloud-migration
glmanhtu Sep 11, 2019
66c4ed9
Merge pull request #332 from OmicsDI/hotfix/node-db
mindcrusher11 Sep 13, 2019
2fc23d2
updated kubernetes for testing installation
mindcrusher11 Sep 20, 2019
2834cc9
added comment for pull request merge
mindcrusher11 Sep 20, 2019
9ee83d2
updated for testing environment
mindcrusher11 Sep 23, 2019
6844a5b
updated links for deployments
mindcrusher11 Sep 23, 2019
2acec0e
updated api link
mindcrusher11 Jan 28, 2020
96ffd75
Merge pull request #342 from OmicsDI/col/gaurhari
mindcrusher11 Jan 28, 2020
a8eb850
updated link for api
mindcrusher11 Jan 29, 2020
a2158d5
updated api link
mindcrusher11 Jan 29, 2020
ef2c894
Merge branch 'dev' into col/gaurhari
mindcrusher11 Jan 29, 2020
cc93cca
Merge pull request #345 from OmicsDI/col/gaurhari
mindcrusher11 Jan 29, 2020
77ea326
updated api for help link
mindcrusher11 Jan 30, 2020
f6a0497
Merge branch 'col/gaurhari' of https://github.com/OmicsDI/ddi-web-app…
mindcrusher11 Jan 30, 2020
d378409
Merge pull request #346 from OmicsDI/col/gaurhari
mindcrusher11 Jan 30, 2020
7481c04
updated web for api link
mindcrusher11 Feb 3, 2020
395904a
Merge branch 'dev' into col/gaurhari
mindcrusher11 Feb 3, 2020
0678cea
nav fix
hll3939092 Apr 8, 2020
58d5db7
Merge branch 'col/gaurhari' into profile-nav-fix
mindcrusher11 Jun 18, 2020
a6b29eb
Merge pull request #352 from OmicsDI/profile-nav-fix
mindcrusher11 Jun 18, 2020
7547f14
updated images icon
mindcrusher11 Jul 8, 2020
de15299
Merge branch 'col/gaurhari' of https://github.com/OmicsDI/ddi-web-app…
mindcrusher11 Jul 8, 2020
d450f9d
unknown image updated
mindcrusher11 Jul 8, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules
dist
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@ addons:

script:
- ng lint
- ng test --watch false
- npm run e2e
- ng test --watch false
33 changes: 33 additions & 0 deletions Dockerfile.ssr
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Stage 0, "build-stage", based on Node.js, to build and compile the frontend
FROM node:10-alpine as build-stage
WORKDIR /app
RUN apk add --no-cache git
COPY package*.json /app/
RUN npm install
COPY ./ /app/

ARG configuration=prod
RUN npm run build -- --configuration $configuration
RUN npm run ng run web:server:$configuration
RUN npm run compile:server

# Stage 1, based on Nginx, to have only the compiled app, ready for production with Nginx
FROM node:10-alpine

RUN npm install pm2 -g

WORKDIR /app

# Copy dependency definitions
COPY --from=build-stage /app/package.json /app

RUN mkdir /app/dist

# Get all the code needed to run the app
COPY --from=build-stage /app/dist /app/dist

ENV PORT 8092
EXPOSE 8092

CMD ["pm2-runtime", "start", "/app/dist/server.js"]

17 changes: 17 additions & 0 deletions Dockerfile.static
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Stage 0, "build-stage", based on Node.js, to build and compile the frontend
FROM node:10-alpine as build-stage
WORKDIR /app
RUN apk add --no-cache git
COPY package*.json /app/
RUN npm install
COPY ./ /app/
ARG configuration=prod
RUN npm run build -- --configuration $configuration

# Stage 1, based on Nginx, to have only the compiled app, ready for production with Nginx
FROM nginx:1.15-alpine
EXPOSE 8080
RUN rm -rf /usr/share/nginx/html/*
COPY --from=build-stage /app/dist/browser/ /usr/share/nginx/html
COPY --from=build-stage /app/nginx.conf /etc/nginx/conf.d/default.conf
CMD ["nginx", "-g", "daemon off;"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Web

This project's running with Angular 6.1.7
This project's running with Angular 7.2.9

## Development server
Run `ng serve --configuration=dev` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
Expand Down
30 changes: 29 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,23 @@
"with": "src/environments/environment.prod.ts"
}
]
},
"hari": {
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.hari.ts"
}
]
}
}
},
Expand All @@ -102,6 +119,9 @@
},
"prod": {
"browserTarget": "web:build:prod"
},
"hari": {
"browserTarget": "web:build:hari"
}
}
},
Expand Down Expand Up @@ -177,6 +197,14 @@
"with": "src/environments/environment.local.ts"
}
]
},
"hari": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.hari.ts"
}
]
}
}
}
Expand Down Expand Up @@ -215,4 +243,4 @@
"prefix": "app"
}
}
}
}
33 changes: 33 additions & 0 deletions k8s/frontend.dev.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: omicsdi-frontend
namespace: dev
spec:
selector:
matchLabels:
app: omicsdi-frontend
replicas: 1
template:
metadata:
labels:
app: omicsdi-frontend
spec:
containers:
- name: omicsdi-frontend
image: omicsdi/omicsdi-frontend:omicsdi.dev.01
ports:
- containerPort: 8080
---
apiVersion: v1
kind: Service
metadata:
name: omicsdi-frontend
labels:
app: omicsdi-frontend
spec:
ports:
- port: 8080
targetPort: 8080
selector:
app: omicsdi-frontend
34 changes: 34 additions & 0 deletions k8s/frontend.hari.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: omicsdi-frontend
namespace: hari
spec:
selector:
matchLabels:
app: omicsdi-frontend
replicas: 2
template:
metadata:
labels:
app: omicsdi-frontend
spec:
containers:
- name: omicsdi-frontend
image: omicsdi/omicsdi-frontend:omicsdi.dev.01
ports:
- containerPort: 8080
---
apiVersion: v1
kind: Service
metadata:
name: omicsdi-frontend
labels:
app: omicsdi-frontend
spec:
ports:
- port: 8080
targetPort: 8080
selector:
app: omicsdi-frontend
---
36 changes: 36 additions & 0 deletions k8s/frontend.local.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: omicsdi-frontend
namespace: local
spec:
selector:
matchLabels:
app: omicsdi-frontend
replicas: 1
template:
metadata:
labels:
app: omicsdi-frontend
spec:
containers:
- name: omicsdi-frontend
image: omicsdi/omicsdi-frontend:omicsdi.dev.01
ports:
- containerPort: 8080
---
apiVersion: v1
kind: Service
metadata:
name: omicsdi-frontend
namespace: local
labels:
app: omicsdi-frontend
spec:
type: NodePort
ports:
- port: 8080
nodePort: 30100
targetPort: 8080
selector:
app: omicsdi-frontend
33 changes: 33 additions & 0 deletions k8s/frontend.prod.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: omicsdi-frontend
namespace: prod
spec:
selector:
matchLabels:
app: omicsdi-frontend
replicas: 2
template:
metadata:
labels:
app: omicsdi-frontend
spec:
containers:
- name: omicsdi-frontend
image: omicsdi/omicsdi-frontend:omicsdi.dev.01
ports:
- containerPort: 8080
---
apiVersion: v1
kind: Service
metadata:
name: omicsdi-frontend
labels:
app: omicsdi-frontend
spec:
ports:
- port: 8080
targetPort: 8080
selector:
app: omicsdi-frontend
15 changes: 15 additions & 0 deletions k8s/ingress.dev.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: omicsdi-dev
namespace: dev
spec:
rules:
- host: dev.omicsdi.org
http:
paths:
- path: /
backend:
serviceName: omicsdi-frontend
servicePort: 8080

14 changes: 14 additions & 0 deletions k8s/ingress.hari.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: omicsdi-prod
namespace: hari
spec:
rules:
- host: stage.omicsdi.org
http:
paths:
- path: /
backend:
serviceName: omicsdi-frontend
servicePort: 8080
14 changes: 14 additions & 0 deletions k8s/ingress.prod.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: omicsdi-prod
namespace: prod
spec:
rules:
- host: stage.omicsdi.org
http:
paths:
- path: /
backend:
serviceName: omicsdi-frontend
servicePort: 8080
34 changes: 34 additions & 0 deletions k8s/ssr.dev.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: omicsdi-ssr
namespace: dev
spec:
selector:
matchLabels:
app: omicsdi-ssr
replicas: 1
template:
metadata:
labels:
app: omicsdi-ssr
spec:
containers:
- name: omicsdi-ssr
image: omicsdi/omicsdi-ssr:omicsdi.dev.01
ports:
- containerPort: 8092
---
apiVersion: v1
kind: Service
metadata:
name: omicsdi-ssr
namespace: dev
labels:
app: omicsdi-ssr
spec:
ports:
- port: 8092
targetPort: 8092
selector:
app: omicsdi-ssr
34 changes: 34 additions & 0 deletions k8s/ssr.hari.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: omicsdi-ssr
namespace: hari
spec:
selector:
matchLabels:
app: omicsdi-ssr
replicas: 4
template:
metadata:
labels:
app: omicsdi-ssr
spec:
containers:
- name: omicsdi-ssr
image: omicsdi/omicsdi-ssr:omicsdi.dev.01
ports:
- containerPort: 8092
---
apiVersion: v1
kind: Service
metadata:
name: omicsdi-ssr
namespace: hari
labels:
app: omicsdi-ssr
spec:
ports:
- port: 8092
targetPort: 8092
selector:
app: omicsdi-ssr
Loading