diff --git a/docker/Dockerfile.dependencies b/docker/Dockerfile.dependencies index 3502ce24c..0390f0b27 100644 --- a/docker/Dockerfile.dependencies +++ b/docker/Dockerfile.dependencies @@ -35,8 +35,9 @@ COPY ./scripts/utils.sh ${BUILD_DIR}/scripts/utils.sh COPY ./scripts/install_core_dependencies.sh ${BUILD_DIR}/scripts/ COPY ./scripts/install_docs_dependencies.sh ${BUILD_DIR}/scripts/ COPY ./scripts/install_repo_dependencies.sh ${BUILD_DIR}/scripts/ -COPY ./scripts/install_ws_dependencies.sh ${BUILD_DIR}/scripts/ COPY ./scripts/install_authz_dependencies.sh ${BUILD_DIR}/scripts/ +COPY ./web/package.json ${BUILD_DIR}/web/package.json +COPY ./scripts/install_ws_dependencies.sh ${BUILD_DIR}/scripts/ COPY ./scripts/generate_datafed.sh ${BUILD_DIR}/scripts/generate_datafed.sh RUN echo "#!/bin/bash\n\$@" > /usr/bin/sudo && chmod +x /usr/bin/sudo diff --git a/web/docker/Dockerfile b/web/docker/Dockerfile index d31cc8f17..9ed5a7b8f 100644 --- a/web/docker/Dockerfile +++ b/web/docker/Dockerfile @@ -76,9 +76,9 @@ COPY --chown=datafed:root ./scripts/install_ws.sh ${BUILD_DIR}/sc COPY --chown=datafed:root ./cmake/Version.cmake ${BUILD_DIR}/cmake/Version.cmake COPY --chown=datafed:root ./scripts/utils.sh ${BUILD_DIR}/scripts/utils.sh COPY --chown=datafed:root ./scripts/export_dependency_version.sh ${BUILD_DIR}/scripts/export_dependency_version.sh +COPY --from=ws-build --chown=datafed:root ${DATAFED_DEPENDENCIES_INSTALL_PATH}/nvm ${DATAFED_DEPENDENCIES_INSTALL_PATH}/nvm COPY --from=ws-build --chown=datafed:root ${BUILD_DIR}/web ${BUILD_DIR}/web -COPY --from=ws-build --chown=datafed:root ${DATAFED_INSTALL_PATH} ${DATAFED_INSTALL_PATH} -COPY --from=ws-build --chown=datafed:root ${DATAFED_DEPENDENCIES_INSTALL_PATH} ${DATAFED_DEPENDENCIES_INSTALL_PATH} +COPY --from=ws-build --chown=datafed:root ${DATAFED_INSTALL_PATH}/web ${DATAFED_INSTALL_PATH}/web COPY --from=ws-build --chown=datafed:root /usr/bin/curl /usr/bin/curl RUN chown -R datafed:root ${DATAFED_INSTALL_PATH}/web @@ -87,10 +87,7 @@ RUN chown -R datafed:root ${BUILD_DIR} WORKDIR ${DATAFED_DIR} RUN echo "${DATAFED_DIR}" -RUN . ${BUILD_DIR}/scripts/export_dependency_version.sh && \ - . ${DATAFED_DEPENDENCIES_INSTALL_PATH}/nvm/nvm.sh && \ - npm --allow-root --unsafe-perm --prefix ${DATAFED_INSTALL_PATH}/web install USER root -ENTRYPOINT ["/datafed/source/web/docker/entrypoint.sh", "/opt/datafed/web/datafed-ws.js", "/datafed/source/config/datafed-ws.cfg" ] +ENTRYPOINT ["/datafed/source/web/docker/entrypoint.sh", "/datafed/source/web/datafed-ws.js", "/datafed/source/config/datafed-ws.cfg" ] diff --git a/web/docker/entrypoint.sh b/web/docker/entrypoint.sh index 92482ca4a..3ef52ae68 100755 --- a/web/docker/entrypoint.sh +++ b/web/docker/entrypoint.sh @@ -14,7 +14,6 @@ PROJECT_ROOT=$(realpath "${SOURCE}/../..") "${PROJECT_ROOT}/scripts/generate_datafed.sh" "${PROJECT_ROOT}/scripts/generate_ws_config.sh" -"${PROJECT_ROOT}/scripts/install_ws.sh" . "${PROJECT_ROOT}/scripts/dependency_versions.sh" export NVM_DIR="${DATAFED_DEPENDENCIES_INSTALL_PATH}/nvm"