Skip to content

Commit

Permalink
Merge pull request #10913 from cBioPortal/demo-fix-docker-web-and-dat…
Browse files Browse the repository at this point in the history
…a-image

Fix web and data image build
  • Loading branch information
dippindots authored Jul 29, 2024
2 parents e589b7d + 0ab890b commit 868273c
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions docker/web-and-data/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ RUN apt-get update; apt-get install -y --no-install-recommends \
python3-dev \
python3-pip \
unzip \
&& rm -rf /var/lib/apt/lists/* \
&& pip3 install wheel
&& rm -rf /var/lib/apt/lists/*

# copy over core files and data-related scripts
RUN mkdir -p /cbioportal
Expand All @@ -52,7 +51,7 @@ COPY --from=build /cbioportal/src/main/resources/db-scripts /cbioportal/db-scrip

# install build and runtime dependencies
# ignore update failure980[1298[01 w2308s
RUN pip3 install -r /core/requirements.txt
RUN pip3 install --break-system-packages -r /core/requirements.txt

# add importer scripts to PATH for easy running in containers
RUN find /core/scripts/ -type f -executable \! -name '*.pl' -print0 | xargs -0 -- ln -st /usr/local/bin
Expand All @@ -74,4 +73,4 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/classes $PORTAL_WEB_HOME/
# add entrypoint
COPY --from=build /cbioportal/docker/web-and-data/docker-entrypoint.sh /usr/local/bin/
ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["sh", "-c", "java $(echo $JAVA_OPTS) -cp /cbioportal-webapp:/cbioportal-webapp/lib/* org.cbioportal.PortalApplication $(echo $WEBAPP_OPTS)"]
CMD ["sh", "-c", "java $(echo $JAVA_OPTS) -cp /cbioportal-webapp:/cbioportal-webapp/lib/* org.cbioportal.PortalApplication $(echo $WEBAPP_OPTS)"]

0 comments on commit 868273c

Please sign in to comment.