diff --git a/.circleci/config.yml b/.circleci/config.yml index 126ec471..17c10dc3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ jobs: # Orchestrate jobs using workflows # See: https://circleci.com/docs/configuration-reference/#workflows workflows: - devcontainer-publish-1.6.1-amd64: + devcontainer-publish-1.6.1: jobs: - devcontainer-publish: filters: diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile index a1b6046f..14f8429c 100644 --- a/docker/app/Dockerfile +++ b/docker/app/Dockerfile @@ -34,26 +34,27 @@ FROM secretflow/secretflow-anolis8:1.6.1b0 RUN useradd -m secretnote -COPY --from=build /dist /dist - -RUN pip install /dist/pyprojects/secretnote/dist/*.whl - -WORKDIR /root - RUN curl -fsSL https://rpm.nodesource.com/setup_18.x | bash - RUN yum install -y nodejs +RUN npm config set registry https://registry.npmmirror.com RUN npm install @difizen/libro-analyzer -COPY ./docker/app/root/ /root/ +COPY --from=build /dist /dist +RUN pip install /dist/pyprojects/secretnote/dist/*.whl + +WORKDIR /home/secretnote + +COPY ./docker/app/root/ ./ RUN mkdir workspace -RUN chown -R secretnote:secretnote /root +RUN chown -R secretnote:secretnote /home/secretnote USER secretnote + ENV SELF_PARTY=alice ENV ALL_PARTIES=alice,bob EXPOSE 8888 -ENTRYPOINT [ "/root/scripts/start.sh" ] +ENTRYPOINT [ "/home/secretnote/scripts/start.sh" ] diff --git a/docker/app/root/.jupyter/jupyter_server_config.py b/docker/app/root/.jupyter/jupyter_server_config.py index 05e24454..73cbcaee 100644 --- a/docker/app/root/.jupyter/jupyter_server_config.py +++ b/docker/app/root/.jupyter/jupyter_server_config.py @@ -15,7 +15,7 @@ c.ServerApp.ip = "*" -c.ServerApp.root_dir = "/root/workspace" +c.ServerApp.root_dir = "/home/secretnote/workspace" c.LanguageServerManager.autodetect = False diff --git a/docker/sim/docker-compose.yml b/docker/sim/docker-compose.yml index dccef625..dd6f6f81 100644 --- a/docker/sim/docker-compose.yml +++ b/docker/sim/docker-compose.yml @@ -1,6 +1,6 @@ services: alice: - image: 'secretflow/secretnote:1.6.1-amd64' + image: 'secretflow/secretnote:1.6.1' platform: linux/amd64 environment: - SELF_PARTY=alice @@ -10,7 +10,7 @@ services: - ./alice:/root/workspace bob: - image: 'secretflow/secretnote:1.6.1-amd64' + image: 'secretflow/secretnote:1.6.1' platform: linux/amd64 environment: - SELF_PARTY=bob