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
344
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
4aa0d790
Commit
4aa0d790
authored
27 minutes ago
by
Mark Harding
Browse files
Options
Download
(chore): ci configs
parent
6a3dac72
epic/SSR
1 merge request
!343
WIP: Epic/ssr
Pipeline
#108508509
failed with stages
in 9 minutes and 42 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
7 deletions
+11
-7
.gitlab-ci.yml
View file @
4aa0d790
...
...
@@ -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
...
...
@@ -87,7 +87,8 @@ build:review:
-
npm ci && npm install -g gulp-cli
-
npm run postinstall
-
gulp build.sass && gulp build.sass
##weird build needs to be run twice for now
-
sh build/base-locale.sh dist
# - sh build/base-locale.sh dist
-
npm run build:ssr
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/server/Dockerfile
View file @
4aa0d790
...
...
@@ -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.
src/app/services/ui/material.ts
View file @
4aa0d790
...
...
@@ -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