Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Guerman Kopytov
fian-main-ui
Commits
75380f02
Commit
75380f02
authored
1 month ago
by
Guerman Kopytov
Browse files
Options
Download
Email Patches
Plain Diff
новая сборка
parent
7fc04d82
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/fian-react
+1
-1
modules/fian-react
src/Makefile
+9
-3
src/Makefile
with
10 additions
and
4 deletions
+10
-4
fian-react
@
66056d23
Compare
91ed5263
...
66056d23
Subproject commit
91ed526379631aabc82596950146b1c360f027d9
Subproject commit
66056d23aead0f781e75c2cbaceee74adec2b678
This diff is collapsed.
Click to expand it.
src/Makefile
View file @
75380f02
...
...
@@ -24,19 +24,25 @@ image-dev: fian-lws-compile
$(
eval
BUILD
=
"001.0"
)
$(
eval
IMAGE
=
"inmpea/fian:
${API}
-
${BUILD}
-dev"
)
$(
eval
TMPDIR
=
"container.dir"
)
$(
eval
MODULE_VUE
=
"
/home/germank/polygon/000/26-vue/vue-project
"
)
$(
eval
MODULE_REACT
=
"
/home/germank/polygon/000/25-react/my-app/
"
)
$(
eval
MODULE_VUE
=
"
../modules/fian-vue
"
)
$(
eval
MODULE_REACT
=
"
../modules/fian-react
"
)
rm
-rf
${TMPDIR}
#mkdir -p ${TMPDIR}/APP/bin
mkdir
-p
${TMPDIR}/APP/bin/mount-origin/react-app
cp
fian-lws
${TMPDIR}/APP/bin
#cp mount-origin/index.html ${TMPDIR}/APP/bin/mount-origin
echo
"making ${MODULE_VUE}/dist and packing into container"
(cd
${MODULE_VUE}
&&
npm
install
&&
npm
run
build
--
--base
=
'./'
)
echo
"cp -r ${MODULE_VUE}/dist/* ${TMPDIR}/APP/bin/mount-origin"
cp
-r
${MODULE_VUE}/dist/*
${TMPDIR}/APP/bin/mount-origin
echo
"making ${MODULE_REACT}/build and packing into container"
(cd
${MODULE_REACT}
&&
npm
install
&&
npm
run
build)
echo
"cp -r ${MODULE_REACT}/build/* ${TMPDIR}/APP/bin/mount-origin"
cp
-r
${MODULE_REACT}/build/*
${TMPDIR}/APP/bin/mount-origin/react-app
cd
${TMPDIR}
cat
>Dockerfile
<<EOF
FROM
scratch
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help