From dab1e100cf514eccad1bc9b11719b9d21b985fb4 Mon Sep 17 00:00:00 2001 From: wujian0327 <353981613@qq.com> Date: Thu, 8 May 2025 19:53:01 +0800 Subject: [PATCH] update aries docker file --- docker/README.md | 9 +++++++++ docker/aries-engine-dockerfile | 4 ---- docker/aries-engine-dockerfile-hub | 4 ---- docker/start-aries.sh | 9 ++------- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/docker/README.md b/docker/README.md index a392cc803..6fb2b3af1 100644 --- a/docker/README.md +++ b/docker/README.md @@ -15,6 +15,9 @@ docker buildx build -t mega:mono-engine-latest -f ./docker/mono-engine-dockerfil # build frontend mono ui image docker buildx build -t mega:mono-ui-latest-release -f ./docker/mono-ui-dockerfile . +# build backend aries engine image (default in release mode) +docker buildx build -t mega:aries-engine-latest -f ./docker/aries-engine-dockerfile . + ## Test Mono Engine [1] Initiate volume for mono data and postgres data @@ -133,6 +136,12 @@ server { ``` +[4] Run Aries + +``` +docker run --rm -it -d --name aries-engine -p 8001:8001 -p 8001:8001/udp mega:aries-engine-latest +``` + ## Certbot for SSL Certificate [1] Install certbot diff --git a/docker/aries-engine-dockerfile b/docker/aries-engine-dockerfile index abfa984e4..40b1c11bb 100644 --- a/docker/aries-engine-dockerfile +++ b/docker/aries-engine-dockerfile @@ -39,9 +39,6 @@ ENV PATH=/root/.cargo/bin:$PATH COPY . . # build -RUN cargo clean -RUN git submodule deinit --all -f -RUN git submodule update --init --recursive RUN if [ "$BUILD_TYPE" = "release" ]; then \ cargo build -p aries --release; \ else \ @@ -59,7 +56,6 @@ COPY --from=builder /opt/mega/target/$BUILD_TYPE/aries /usr/local/bin/aries COPY --from=builder /opt/mega/docker/start-aries.sh /usr/local/bin/start-aries.sh RUN chmod +x /usr/local/bin/start-aries.sh RUN chmod +x /usr/local/bin/aries -COPY --from=builder /opt/mega/target/$BUILD_TYPE/libpipy.so /usr/local/lib/libpipy.so # refresh shared library cache RUN ldconfig diff --git a/docker/aries-engine-dockerfile-hub b/docker/aries-engine-dockerfile-hub index 6e4997b26..f6627727f 100644 --- a/docker/aries-engine-dockerfile-hub +++ b/docker/aries-engine-dockerfile-hub @@ -39,9 +39,6 @@ ENV PATH=/root/.cargo/bin:$PATH RUN git clone https://github.com/genedna/mega.git . # build -RUN cargo clean -RUN git submodule deinit --all -f -RUN git submodule update --init --recursive RUN if [ "$BUILD_TYPE" = "release" ]; then \ cargo build -p aries --release; \ else \ @@ -59,7 +56,6 @@ COPY --from=builder /opt/mega/target/$BUILD_TYPE/aries /usr/local/bin/aries COPY --from=builder /opt/mega/docker/start-aries.sh /usr/local/bin/start-aries.sh RUN chmod +x /usr/local/bin/start-aries.sh RUN chmod +x /usr/local/bin/aries -COPY --from=builder /opt/mega/target/$BUILD_TYPE/libpipy.so /usr/local/lib/libpipy.so # refresh shared library cache RUN ldconfig diff --git a/docker/start-aries.sh b/docker/start-aries.sh index 9d3efd219..b6a04b56a 100755 --- a/docker/start-aries.sh +++ b/docker/start-aries.sh @@ -1,17 +1,12 @@ #!/bin/sh -# user must set the HUB_HOST -if [ -z "$HUB_HOST" ]; then - echo "HUB_HOST is not set" - exit 1 -fi export MEGA_BASE_DIR="/opt/mega" CONFIG_FILE="$MEGA_BASE_DIR/etc/config.toml" if [ -f "$CONFIG_FILE" ]; then echo "Using config file: $CONFIG_FILE" - exec /usr/local/bin/aries -c "$CONFIG_FILE" --host 0.0.0.0 --hub-host $HUB_HOST + exec /usr/local/bin/aries -c "$CONFIG_FILE" --host 0.0.0.0 else - exec /usr/local/bin/aries --host 0.0.0.0 --hub-host $HUB_HOST + exec /usr/local/bin/aries --host 0.0.0.0 fi \ No newline at end of file