Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
duniter
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
nodes
typescript
duniter
Commits
9618367d
Commit
9618367d
authored
5 years ago
by
Éloïs
Browse files
Options
Downloads
Patches
Plain Diff
[build] remove unused duniteroxyde intermediate binaries
parent
5a0640d3
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!1292
Feature/oxyde crypto
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
release/arch/arm/build-arm.sh
+6
-4
6 additions, 4 deletions
release/arch/arm/build-arm.sh
release/arch/linux/build-lin.sh
+7
-1
7 additions, 1 deletion
release/arch/linux/build-lin.sh
release/docker/Dockerfile
+5
-2
5 additions, 2 deletions
release/docker/Dockerfile
with
18 additions
and
7 deletions
release/arch/arm/build-arm.sh
+
6
−
4
View file @
9618367d
...
@@ -77,10 +77,12 @@ echo $SRC
...
@@ -77,10 +77,12 @@ echo $SRC
# Clean unused UI modules
# Clean unused UI modules
rm
-Rf
node_modules/duniter-ui/node_modules
rm
-Rf
node_modules/duniter-ui/node_modules
# Because we are building in a VM, Node.js could not detect that the target is ARM. So we move the modules' binaries accordingly.
# Remove non production folders
#mv node_modules/naclb/lib/binding/Release/node-v48-linux-x64 node_modules/naclb/lib/binding/Release/node-v48-linux-arm
rm
-rf
coverage
test
#mv node_modules/wotb/lib/binding/Release/node-v48-linux-x64 node_modules/wotb/lib/binding/Release/node-v48-linux-arm
#mv node_modules/sqlite3/lib/binding/Release/node-v48-linux-x64 node_modules/sqlite3/lib/binding/Release/node-v48-linux-arm
# Remove unused duniteroxyde intermediate binaries
rm
-rf
node_modules/duniteroxyde/target
rm
-rf
node_modules/duniteroxyde/native/target
cd
..
cd
..
mkdir
-p
duniter_release
mkdir
-p
duniter_release
...
...
This diff is collapsed.
Click to expand it.
release/arch/linux/build-lin.sh
+
7
−
1
View file @
9618367d
...
@@ -187,7 +187,13 @@ yarn --production || exit 1
...
@@ -187,7 +187,13 @@ yarn --production || exit 1
# Patch leveldown
# Patch leveldown
cp
"
${
ROOT
}
/release/resources/leveldown-fix.json"
"
${
RELEASES
}
/duniter/node_modules/leveldown/package.json"
||
exit
1
cp
"
${
ROOT
}
/release/resources/leveldown-fix.json"
"
${
RELEASES
}
/duniter/node_modules/leveldown/package.json"
||
exit
1
rm
-rf
release coverage
# Non production folders
# Remove non production folders
rm
-rf
coverage release
test
# Remove unused duniteroxyde intermediate binaries
rm
-rf
node_modules/duniteroxyde/target
rm
-rf
node_modules/duniteroxyde/native/target
cp
-r
"
${
RELEASES
}
/duniter"
"
${
RELEASES
}
/desktop_"
||
exit
1
cp
-r
"
${
RELEASES
}
/duniter"
"
${
RELEASES
}
/desktop_"
||
exit
1
cp
-r
"
${
RELEASES
}
/duniter"
"
${
RELEASES
}
/server_"
||
exit
1
cp
-r
"
${
RELEASES
}
/duniter"
"
${
RELEASES
}
/server_"
||
exit
1
...
...
This diff is collapsed.
Click to expand it.
release/docker/Dockerfile
+
5
−
2
View file @
9618367d
...
@@ -26,7 +26,10 @@ RUN export PATH="$HOME/.cargo/bin:$PATH" && \
...
@@ -26,7 +26,10 @@ RUN export PATH="$HOME/.cargo/bin:$PATH" && \
export
RUSTFLAGS
=
"-C target-feature=-crt-static"
&&
\
export
RUSTFLAGS
=
"-C target-feature=-crt-static"
&&
\
yarn
install
--production
&&
\
yarn
install
--production
&&
\
yarn add duniter-ui@
${
DUNITER_UI_VER
}
&&
\
yarn add duniter-ui@
${
DUNITER_UI_VER
}
&&
\
rm
-rf
test
mv
release/docker/duniter.sh docker.sh
&&
\
rm
-rf
coverage release
test
&&
\
rm
-rf
node_modules/duniteroxyde/target
&&
\
rm
-rf
node_modules/duniteroxyde/native/target
# ------------------------------------------------------------------------------
# ------------------------------------------------------------------------------
# Final Stage
# Final Stage
...
@@ -43,7 +46,7 @@ RUN mkdir -p /var/lib/duniter /etc/duniter && chown duniter:duniter /var/lib/dun
...
@@ -43,7 +46,7 @@ RUN mkdir -p /var/lib/duniter /etc/duniter && chown duniter:duniter /var/lib/dun
COPY
--from=build --chown=duniter:duniter . /duniter/duniter
COPY
--from=build --chown=duniter:duniter . /duniter/duniter
# copy bootstrap script
# copy bootstrap script
RUN
cp
/duniter/duniter/
release/docker/dunit
er.sh /usr/bin/duniter
&&
\
RUN
cp
/duniter/duniter/
dock
er.sh /usr/bin/duniter
&&
\
chmod
+x /usr/bin/duniter
&&
\
chmod
+x /usr/bin/duniter
&&
\
chown
duniter:duniter /usr/bin/duniter
chown
duniter:duniter /usr/bin/duniter
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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