JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

final touches

Browse Source 
Change-Id: I8fcc986f71f592507dc3f35ce4352647da46d461
This commit is contained in:
Stefan Benten 2022-02-20 23:42:43 +01:00 committed by Igor
parent 76be9e6efd
commit f89e030c3f
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -202,7 +202,7 @@ images: multinode-image satellite-image storagenode-image versioncontrol-image #
echo Built version: ${TAG} echo Built version: ${TAG}
.PHONY: multinode-image .PHONY: multinode-image
satellite-image: multinode_linux_arm multinode_linux_arm64 multinode_linux_amd64 ## Build multinode Docker image multinode-image: multinode_linux_arm multinode_linux_arm64 multinode_linux_amd64 ## Build multinode Docker image
${DOCKER_BUILD} --pull=true -t storjlabs/multinode:${TAG}${CUSTOMTAG}-amd64 \ ${DOCKER_BUILD} --pull=true -t storjlabs/multinode:${TAG}${CUSTOMTAG}-amd64 \
-f cmd/multinode/Dockerfile . -f cmd/multinode/Dockerfile .
${DOCKER_BUILD} --pull=true -t storjlabs/multinode:${TAG}${CUSTOMTAG}-arm32v6 \ ${DOCKER_BUILD} --pull=true -t storjlabs/multinode:${TAG}${CUSTOMTAG}-arm32v6 \

6
cmd/multinode/Dockerfile
View File

@ -8,11 +8,9 @@ FROM ${DOCKER_ARCH:-amd64}/alpine
ARG TAG ARG TAG
ARG GOARCH ARG GOARCH
ENV GOARCH ${GOARCH} ENV GOARCH ${GOARCH}
EXPOSE 15002
ENV CONF_PATH=/root/.local/storj/multinode
WORKDIR /app WORKDIR /app
VOLUME /root/.local/storj/multinode
COPY --from=ca-cert /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=ca-cert /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY release/${TAG}/multinode_linux_${GOARCH:-amd64} /app/multinode COPY release/${TAG}/multinode_linux_${GOARCH:-amd64} /app/multinode
COPY cmd/multinode/entrypoint /entrypoint COPY cmd/multinode/entrypoint /entrypoint
ENTRYPOINT ["/entrypoint"] ENTRYPOINT ["/entrypoint"]

11
cmd/multinode/entrypoint Normal file → Executable file
View File

@ -1,9 +1,12 @@
#!/bin/sh #!/bin/sh
set -euo pipefail set -euo pipefail
if [[ ! -f "${CONF_PATH}/config.yaml" ]]; then if [[ ! -f "/app/config/config.yaml" ]]; then
./multinode setup ./multinode setup --config-dir config --identity-dir identity
fi fi
RUN_PARAMS="${RUN_PARAMS:-} --config ${CONF_PATH} --console.address=:15002" RUN_PARAMS="${RUN_PARAMS:-} --config-dir config"
exec ./multinode run $RUN_PARAMS "$@" RUN_PARAMS="${RUN_PARAMS:-} --identity-dir identity"
RUN_PARAMS="${RUN_PARAMS:-} --console.address=:15002"
exec ./multinode run $RUN_PARAMS "$@"