From 4cfdb03a70270483aa81eaf0d1ffe6960190308d Mon Sep 17 00:00:00 2001 From: Luke Sikina Date: Thu, 21 Nov 2019 10:53:49 -0500 Subject: [PATCH] Fixes made while creating staging --- services/import-pipeline/Dockerfile | 4 ++-- services/session-service/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/import-pipeline/Dockerfile b/services/import-pipeline/Dockerfile index 5149520..6587e79 100644 --- a/services/import-pipeline/Dockerfile +++ b/services/import-pipeline/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:latest +FROM debian:9 ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 ENV PATH /opt/conda/bin:$PATH @@ -22,4 +22,4 @@ RUN apt-get install -y curl grep sed dpkg && \ rm tini.deb && \ apt-get clean RUN /bin/bash -c 'conda install -y dropbox requests mysqlclient ipython jinja2 && conda update -y sqlite && pip install apscheduler && pip install gspread oauth2client' -ENTRYPOINT /bin/bash -c "python /importer/import_service/main.py" \ No newline at end of file +ENTRYPOINT /bin/bash -c "python /importer/import_service/main.py" diff --git a/services/session-service/Dockerfile b/services/session-service/Dockerfile index 868c018..3d59e7c 100644 --- a/services/session-service/Dockerfile +++ b/services/session-service/Dockerfile @@ -4,7 +4,7 @@ RUN apt-get update && apt-get install -y maven git ARG BRANCH RUN git clone https://github.com/cBioPortal/session-service.git --branch $BRANCH && \ mvn -f session-service/pom.xml package -DskipTests -Dpackaging.type=jar && \ - mv session-service/target/session_service*.jar /session-service.jar + mv session-service/target/session_service-0.2.0.jar /session-service.jar ENV SS_MONGO_HOST=session-service-mongodb SS_MONGO_PORT=27017 SS_MONGO_NAME=session-service SERVER_PORT=8090 ENTRYPOINT java -Dspring.data.mongodb.uri=mongodb://$SS_MONGO_HOST:$SS_MONGO_PORT/$SS_MONGO_NAME \ -Dserver.port=$SERVER_PORT -Dserver.contextPath=/ -jar /session-service.jar