Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
uphrh-SunbirdEd-portal-old
Commits
2bd6519d
Unverified
Commit
2bd6519d
authored
5 years ago
by
G33tha
Committed by
GitHub
5 years ago
Browse files
Options
Download
Patches
Plain Diff
Editor changes (#2243)
* Update Jenkinsfile
parent
d44aa10a
master
Dark_theme
SB-25589
SB-28090
aws_fileRead
contributions
dependabot/npm_and_yarn/src/app/client/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/app/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/app/express-4.17.3
dependabot/npm_and_yarn/src/app/jsonwebtoken-9.0.0
dependabot/npm_and_yarn/src/desktop/OpenRAP/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/desktop/OpenRAP/express-4.17.3
dependabot/npm_and_yarn/src/desktop/OpenRAP/jsonwebtoken-9.0.0
dependabot/npm_and_yarn/src/desktop/OpenRAP/qs-6.5.3
dependabot/npm_and_yarn/src/desktop/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/desktop/express-4.17.3
dependabot/npm_and_yarn/src/desktop/jsonwebtoken-9.0.0
dependabot/npm_and_yarn/src/desktop/qs-6.10.3
desktop-common-consumption
filters_5.1.1
gcp
gcp_test
keshavprasadms-patch-1
keshavprasadms-patch-2
release-2.10.0
release-2.10.1
release-2.10.2
release-2.10.3
release-2.2.0
release-2.2.1
release-2.3.0
release-2.3.1
release-2.3.5
release-2.3.6
release-2.4.0
release-2.4.1
release-2.4.2
release-2.5.0
release-2.5.1
release-2.6.0
release-2.6.0-loadtest
release-2.6.5
release-2.6.6
release-2.7.0
release-2.8.0
release-2.8.1
release-2.8.10
release-2.8.11
release-2.8.12
release-2.8.2
release-2.8.3
release-2.8.4
release-2.8.5
release-2.8.6
release-2.8.7
release-2.8.8
release-2.8.9
release-2.9.0
release-3.0
release-3.0-merge
release-3.0.0
release-3.0.1
release-3.0.2
release-3.0.3
release-3.0.4
release-3.0.4-sso
release-3.1.0
release-3.1.1
release-3.1.2
release-3.2.0
release-3.2.1
release-3.2.10
release-3.2.11
release-3.2.12
release-3.2.13
release-3.2.14
release-3.2.2
release-3.2.3
release-3.2.4
release-3.3.0
release-3.3.0-telemetry-fix
release-3.3.1
release-3.3.2
release-3.4.0
release-3.4.1
release-3.4.2
release-3.4.3
release-3.4.4
release-3.4.5
release-3.4.6
release-3.4.7
release-3.5.0
release-3.5.1
release-3.5.2
release-3.5.3
release-3.6.0
release-3.6.1
release-3.6.5
release-3.6.6
release-3.7.0
release-3.7.1
release-3.7.2
release-3.8.0
release-3.8.1
release-3.8.2
release-3.8.3
release-3.9.0
release-3.9.1
release-3.9.2
release-3.9.3
release-4.0.0
release-4.0.1
release-4.0.2
release-4.1
release-4.1.0
release-4.1.1
release-4.10.0
release-4.10.0.1
release-4.10.1
release-4.10.2
release-4.10.2.1
release-4.10.2.2
release-4.10.3
release-4.2.0
release-4.2.1
release-4.3.0
release-4.3.1
release-4.4.0
release-4.4.1
release-4.5.0
release-4.5.1
release-4.5.2
release-4.6.0
release-4.7.0
release-4.7.1
release-4.8.0
release-4.8.5
release-4.9.0
release-4.9.1
release-5.0.0
release-5.0.0.1
release-5.0.0.2
release-5.0.0.3
release-5.0.1
release-5.0.2
release-5.1.0
release-5.1.1
release-sonarcloud
revert-3718-copypi
revert-3842-release-2.8.7
revert-3890-release-2.8.9
revert-4427-player-cache-issue
revert-4537-SB-19763
revert-5244-sh-809
revert-5260-SB-table-3.3.0
revert-8284-release-5.0.0
sharathkashyap-patch-1
Tags unavailable
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Dockerfile
+8
-0
Dockerfile
Jenkinsfile
+1
-1
Jenkinsfile
build.sh
+5
-1
build.sh
src/app/gulpfile.js
+3
-3
src/app/gulpfile.js
with
17 additions
and
5 deletions
+17
-5
Dockerfile
+
8
−
0
View file @
2bd6519d
...
...
@@ -6,6 +6,14 @@ RUN mkdir -p /opt/player \
WORKDIR /opt/player
COPY
* /opt/player/
WORKDIR
/opt/player/app
ARG
content_editor_url
ENV
sunbird_content_editor_artifact_url ${content_editor_url}
ARG
collection_editor_url
ENV
sunbird_collection_editor_artifact_url ${collection_editor_url}
ARG
generic_editor_url
ENV
sunbird_generic_editor_artifact_url ${generic_editor_url}
RUN
npm
set
progress
=
false
RUN
npm
install
--unsafe-perm
RUN
npm run deploy
...
...
This diff is collapsed.
Click to expand it.
Jenkinsfile
+
1
−
1
View file @
2bd6519d
...
...
@@ -37,7 +37,7 @@ node('build-slave') {
echo
"build_tag: "
+
build_tag
stage
(
'Build'
)
{
sh
(
"./build.sh ${build_tag} ${env.NODE_NAME} ${hub_org}"
)
sh
(
"./build.sh ${build_tag} ${env.NODE_NAME} ${hub_org}
${params.sunbird_content_editor_artifact_url} ${params.sunbird_collection_editor_artifact_url} ${params.sunbird_generic_editor_artifact_url}
"
)
}
stage
(
'ArchiveArtifacts'
)
{
...
...
This diff is collapsed.
Click to expand it.
build.sh
+
5
−
1
View file @
2bd6519d
...
...
@@ -5,6 +5,10 @@ build_tag=$1
name
=
player
node
=
$2
org
=
$3
content_editor_url
=
$4
collection_editor_url
=
$5
generic_editor_url
=
$6
commit_hash
=
$(
git rev-parse
--short
HEAD
)
docker build
--build-arg
commit_hash
=
$(
git rev-parse
--short
HEAD
)
--label
commitHash
=
$(
git rev-parse
--short
HEAD
)
-t
${
org
}
/
${
name
}
:
${
build_tag
}
.
docker build
--build-arg
commit_hash
=
$(
git rev-parse
--short
HEAD
)
--build-arg
content_editor_url
=
$content_editor_url
--build-arg
collection_editor_url
=
$collection_editor_url
--build-arg
generic_editor_url
=
$generic_editor_url
--label
commitHash
=
$(
git rev-parse
--short
HEAD
)
-t
${
org
}
/
${
name
}
:
${
build_tag
}
.
echo
{
\"
image_name
\"
:
\"
${
name
}
\"
,
\"
image_tag
\"
:
\"
${
build_tag
}
\"
,
\"
commit_hash
\"
:
\"
${
commit_hash
}
\"
,
\"
node_name
\"
:
\"
$node
\"
}
>
metadata.json
This diff is collapsed.
Click to expand it.
src/app/gulpfile.js
+
3
−
3
View file @
2bd6519d
...
...
@@ -10,9 +10,9 @@ const brotli = require('gulp-brotli');
const
inject
=
require
(
'
gulp-inject-string
'
);
// To download editors
const
contentEditor
=
'
https://sunbirddev.blob.core.windows.net/
sunbird
-
content
-dev/artefacts/editor/content-editor-iframe-2.1.0.zip
'
// env.contentEditor
;
const
collectionEditor
=
'
https://sunbirddev.blob.core.windows.net/sunbird-content-dev/artefacts/editor/
collection
-
editor
-iframe-2.1.0.zip
'
// env.contentEditor
;
const
genericEditor
=
'
https://sunbirddev.blob.core.windows.net/sunbird-content-dev/artefacts/editor/generic-editor-iframe-2.1.0.zip
'
// env.contentEditor
;
const
contentEditor
=
process
.
env
.
sunbird
_
content
_editor_artifact_url
;
const
collectionEditor
=
process
.
env
.
sunbird_
collection
_
editor
_artifact_url
;
const
genericEditor
=
process
.
env
.
sunbird_generic_editor_artifact_url
;
const
editorsDestPath
=
'
client/src/thirdparty/editors/
'
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets