Skip to content
Projects
Groups
Snippets
Help
Sign in / Register
Toggle navigation
Minds Frontend
Project overview
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
349
Merge Requests
56
CI / CD
Security & Compliance
Packages
Wiki
Snippets
Members
Collapse sidebar
Close sidebar
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Minds
Minds Frontend
Commits
87e9fe3e
Commit
87e9fe3e
authored
2 days ago
by
Mark Harding
Browse files
Options
Download
(chore): ci configs
parent
6a3dac72
No related merge requests found
Pipeline
#108881940
failed with stages
in 29 minutes and 9 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
26 deletions
+22
-26
.gitlab-ci.yml
View file @
87e9fe3e
image
:
m
arkharding/minds-front-base
image
:
m
inds/ci-front:latest
stages
:
-
test
...
...
@@ -17,7 +17,7 @@ variables:
CYPRESS_CACHE_FOLDER
:
'
$CI_PROJECT_DIR/cache/Cypress'
test
:
image
:
circleci/node:
8
-browsers
image
:
circleci/node:
13
-browsers
stage
:
test
script
:
-
npm ci
...
...
@@ -88,6 +88,7 @@ build:review:
-
npm run postinstall
-
gulp build.sass && gulp build.sass
##weird build needs to be run twice for now
-
sh build/base-locale.sh dist
-
ng run minds:server:production
artifacts
:
name
:
'
$CI_COMMIT_REF_SLUG'
paths
:
...
...
@@ -155,8 +156,8 @@ prepare:review:
-
docker:dind
script
:
-
docker login -u gitlab-ci-token -p ${CI_BUILD_TOKEN} ${CI_REGISTRY}
-
docker build -t $CI_REGISTRY_IMAGE/
front-init:$CI_PIPELINE_ID -f containers/front-init
/Dockerfile dist/.
-
docker push $CI_REGISTRY_IMAGE/
front-init
:$CI_PIPELINE_ID
-
docker build -t $CI_REGISTRY_IMAGE/
server:$CI_PIPELINE_ID -f containers/server
/Dockerfile dist/.
-
docker push $CI_REGISTRY_IMAGE/
server
:$CI_PIPELINE_ID
dependencies
:
-
build:review
except
:
...
...
@@ -233,7 +234,8 @@ review:start:
-
"
helm
upgrade
\
--install
\
--reuse-values
\
--set
frontInit.image.repository=$CI_REGISTRY_IMAGE/front-init
\
--set
nginx.image.tag=ssr
\
--set
frontInit.image.repository=$CI_REGISTRY_IMAGE/server
\
--set-string
frontInit.image.tag=$CI_PIPELINE_ID
\
--set
domain=$CI_BUILD_REF_SLUG.$KUBE_INGRESS_BASE_DOMAIN
\
--set
elasticsearch.clusterName=$CI_BUILD_REF_SLUG--elasticsearch
\
...
...
This diff is collapsed.
containers/base/Dockerfile
deleted
100644 → 0
View file @
6a3dac72
FROM
alpine:edge
RUN
apk add
--no-cache
\
chromium
\
git
\
build-base
\
libstdc++
\
make
\
g++
\
python
\
curl
\
udev
\
nodejs
=
8.9.1-r0
\
libsass
RUN
npm
install
-g
typescript gulp @angular/cli
ENV
CHROME_BIN=/usr/bin/chromium-browser
\ No newline at end of file
This diff is collapsed.
containers/ci-front/Dockerfile
0 → 100644
View file @
87e9fe3e
FROM
node:13-alpine
RUN
apk add
--no-cache
\
git
\
libsass
RUN
npm
install
-g
typescript @angular/cli
# Gitlab CI has limited memory
ENV
NODE_OPTIONS="--max-old-space-size=1024"
\ No newline at end of file
This diff is collapsed.
containers/server/Dockerfile
View file @
87e9fe3e
...
...
@@ -3,4 +3,6 @@
###
FROM
node:13-alpine
CMD
node server
\ No newline at end of file
COPY
. /dist
CMD
node /dist/server
\ No newline at end of file
This diff is collapsed.
server.ts
View file @
87e9fe3e
...
...
@@ -29,7 +29,7 @@ app.use(compression());
app
.
use
(
cookieparser
());
const
PORT
=
process
.
env
.
PORT
||
4200
;
const
DIST_FOLDER
=
join
(
process
.
cwd
(),
'
dist
'
);
const
DIST_FOLDER
=
join
(
process
.
cwd
(),
'
dist
/en
'
);
const
template
=
readFileSync
(
join
(
DIST_FOLDER
,
'
index.html
'
)).
toString
();
const
win
=
domino
.
createWindow
(
template
);
...
...
This diff is collapsed.
src/app/services/ui/material.ts
View file @
87e9fe3e
...
...
@@ -3,7 +3,7 @@ export class Material {
window
.
componentHandler
.
upgradeDom
();
}
static
updateElement
(
element
:
any
)
{
if
(
window
.
componentHandler
)
if
(
window
.
componentHandler
)
window
.
componentHandler
.
upgradeElement
(
element
);
}
}
This diff is collapsed.
Please
register
or
sign in
to comment