Skip to content
Snippets Groups Projects
Commit 2963ddd7 authored by Cédric Moreau's avatar Cédric Moreau
Browse files

feat: build for aarch64 (with NodeJS 16)

parent 3a14acb0
No related branches found
No related tags found
No related merge requests found
Pipeline #32943 waiting for manual action
{"active":"debug","targets":{"release":{"rustc":"","nodeVersion":null,"env":{"npm_config_target":null,"npm_config_arch":null,"npm_config_target_arch":null,"npm_config_disturl":null,"npm_config_runtime":null,"npm_config_build_from_source":null,"npm_config_devdir":null}},"debug":{"rustc":"rustc 1.63.0 (4b91a6ea7 2022-08-08)","nodeVersion":"v16.16.0","env":{"npm_config_target":null,"npm_config_arch":null,"npm_config_target_arch":null,"npm_config_disturl":null,"npm_config_runtime":null,"npm_config_build_from_source":null,"npm_config_devdir":null,"npm_config_node_engine":null,"npm_config_nodedir":null,"npm_config_node_gyp":"/Users/cgeek/.nvm/versions/node/v16.16.0/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js","npm_config_platform":null}}}} {"active":"debug","targets":{"release":{"rustc":"","nodeVersion":null,"env":{"npm_config_target":null,"npm_config_arch":null,"npm_config_target_arch":null,"npm_config_disturl":null,"npm_config_runtime":null,"npm_config_build_from_source":null,"npm_config_devdir":null}},"debug":{"rustc":"rustc 1.71.0-nightly (2f2c438dc 2023-05-08)","nodeVersion":"v16.16.0","env":{"npm_config_target":null,"npm_config_arch":null,"npm_config_target_arch":null,"npm_config_disturl":null,"npm_config_runtime":null,"npm_config_build_from_source":null,"npm_config_devdir":null,"npm_config_node_engine":null,"npm_config_nodedir":null,"npm_config_node_gyp":"/Users/cgeek/.nvm/versions/node/v16.16.0/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js","npm_config_platform":null}}}}
\ No newline at end of file \ No newline at end of file
This diff is collapsed.
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
"cors": "2.8.5", "cors": "2.8.5",
"daemonize2": "0.4.2", "daemonize2": "0.4.2",
"ddos": "0.2.1", "ddos": "0.2.1",
"duniter-ui": "^1.8.0",
"errorhandler": "1.5.1", "errorhandler": "1.5.1",
"event-stream": "4.0.1", "event-stream": "4.0.1",
"express": "4.17.1", "express": "4.17.1",
...@@ -136,7 +137,6 @@ ...@@ -136,7 +137,6 @@
"typedoc-plugin-sourcefile-url": "1.0.6", "typedoc-plugin-sourcefile-url": "1.0.6",
"typescript": "3.8.3" "typescript": "3.8.3"
}, },
"peerDependencies": {},
"bin": { "bin": {
"duniter": "./bin/duniter" "duniter": "./bin/duniter"
}, },
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
# This will depend on the current version # This will depend on the current version
NW_VERSION = 0.33.1 NW_VERSION = 0.33.1
ADDON_VERSION = 64 ADDON_VERSION = 64
DUNITER_UI_VERSION = 1.7.x DUNITER_UI_VERSION = 1.8.x
DEV_FILES = $(wildcard .eslint* .git* .npm* .prettierignore Cargo.* deny.toml gui license-header.txt npm* \ DEV_FILES = $(wildcard .eslint* .git* .npm* .prettierignore Cargo.* deny.toml gui license-header.txt npm* \
tsconfig* tslint*) tsconfig* tslint*)
......
...@@ -2,26 +2,28 @@ ...@@ -2,26 +2,28 @@
# Build Stage # Build Stage
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
FROM node:10-alpine as build FROM node:16-alpine as build
LABEL maintainer="elois <elois@duniter.org>" LABEL maintainer="elois <elois@duniter.org>"
LABEL version="0.1.0" LABEL version="0.1.0"
LABEL description="Duniter server (Crypto-currency software to manage libre currency such as Ğ1)" LABEL description="Duniter server (Crypto-currency software to manage libre currency such as Ğ1)"
ARG DUNITER_UI_VER="1.7.x" ARG DUNITER_UI_VER="1.8.x"
RUN apk update && \ RUN apk update && \
apk add ca-certificates curl && \ apk add ca-certificates curl && \
update-ca-certificates && \ update-ca-certificates && \
apk add --update python make g++ apk add --update python3 make g++
WORKDIR /duniter WORKDIR /duniter
# copy source tree # copy source tree
COPY ./ ./ COPY ./ ./
# Avoid local node_modules being reused with conflicting binaries
# Ex. /duniter/duniter/node_modules/sqlite3/lib/binding/node-v93-darwin-arm64/node_sqlite3.node is copied
# while /duniter/duniter/node_modules/sqlite3/lib/binding/node-v93-linux-arm64/node_sqlite3.node' is expected at run.
RUN rm -rf /duniter/node_modules
# install latest stable rust
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
# build duniter # build duniter
RUN PATH=${HOME}/.cargo/bin:${PATH} \ RUN PATH=${HOME}/.cargo/bin:${PATH} \
...@@ -34,7 +36,7 @@ RUN PATH=${HOME}/.cargo/bin:${PATH} \ ...@@ -34,7 +36,7 @@ RUN PATH=${HOME}/.cargo/bin:${PATH} \
# Final Stage # Final Stage
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
FROM node:10-alpine FROM node:16-alpine
# create group and user duniter # create group and user duniter
RUN addgroup -S -g 1111 duniter && \ RUN addgroup -S -g 1111 duniter && \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment