Skip to content
Snippets Groups Projects
Commit 2c0b4c22 authored by Gilles Filippini's avatar Gilles Filippini
Browse files

ref(docker): move duniter.sh code into entrypoint

And link duniter binary as /usr/bin/duniter.
parent 2e6c352d
No related branches found
No related tags found
1 merge request!1381Docker: move config back to volume /var/lib/duniter and other minor changes
...@@ -27,7 +27,6 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y ...@@ -27,7 +27,6 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
RUN PATH=${HOME}/.cargo/bin:${PATH} \ RUN PATH=${HOME}/.cargo/bin:${PATH} \
RUSTFLAGS="-C target-feature=-crt-static" \ RUSTFLAGS="-C target-feature=-crt-static" \
make -C release ADD_DEBUG=N server-gui clean \ make -C release ADD_DEBUG=N server-gui clean \
&& cp release/docker/duniter.sh work/docker.sh \
&& rm -rf work/extra && rm -rf work/extra
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
...@@ -47,10 +46,8 @@ RUN mkdir -p /var/lib/duniter /etc/duniter && chown duniter:duniter /var/lib/dun ...@@ -47,10 +46,8 @@ RUN mkdir -p /var/lib/duniter /etc/duniter && chown duniter:duniter /var/lib/dun
# copy the build artifact from the build stage # copy the build artifact from the build stage
COPY --from=build --chown=duniter:duniter /duniter/work /duniter/duniter COPY --from=build --chown=duniter:duniter /duniter/work /duniter/duniter
# copy bootstrap script # install duniter executable symlink
RUN cp /duniter/duniter/docker.sh /usr/bin/duniter && \ RUN ln -s /duniter/duniter/bin/duniter /usr/bin/duniter
chmod +x /usr/bin/duniter && \
chown duniter:duniter /usr/bin/duniter
# copy entrypoint # copy entrypoint
COPY release/docker/docker-entrypoint.sh / COPY release/docker/docker-entrypoint.sh /
......
...@@ -86,7 +86,28 @@ if [ "$auto_sync" = true ]; then ...@@ -86,7 +86,28 @@ if [ "$auto_sync" = true ]; then
fi fi
fi fi
# Network interface to listen to
export DUNITER_WEB_UI_HOST="0.0.0.0"
# Key file found
if [ -f /etc/duniter/key.yml ]; then
export DUNITER_KEYFILE="/etc/duniter/keys.yml"
fi
# Without parameters, start with web interface
if [ $# = 0 ]; then
set -- direct_webstart
fi
# Set --home option
set -- --home "$home" "$@"
# Define DUNITER_CONF_HOME
DUNITER_CONF_HOME="/etc/duniter"
export DUNITER_CONF_HOME
# Start duniter # Start duniter
cd /duniter/duniter
echo Starting duniter with: echo Starting duniter with:
echo /usr/bin/duniter "$@" echo /usr/bin/duniter "$@"
/usr/bin/duniter "$@" /usr/bin/duniter "$@"
#!/bin/sh
# Without parameters, start with web interface
if [[ -z ${1} ]]; then
set -- direct_webstart
fi
# Define DUNITER_WEB_UI_HOST
DUNITER_WEB_UI_HOST="0.0.0.0"
export DUNITER_WEB_UI_HOST
# Define DUNITER_CONF_HOME
DUNITER_CONF_HOME="/etc/duniter"
export DUNITER_CONF_HOME
# Key file found
if [[ -f /etc/duniter/key.yml ]]; then
DUNITER_KEYFILE="/etc/duniter/keys.yml"
export DUNITER_KEYFILE
fi
# Start duniter
cd /duniter/duniter/
bin/duniter --home /var/lib/duniter "$@"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment