Commit 71357abc authored by dgasull's avatar dgasull

Fixed logging issues and using alpine docker images

parent 7845dd4a
......@@ -16,13 +16,15 @@ ENV STUBSPATH=${ELASTIC_MODEL_HOME}/stubs
ENV STUBS_JAR=${ELASTIC_MODEL_HOME}/stubs.jar
ENV MODELBINPATH=${ELASTIC_MODEL_HOME}/model/target/classes
# Install maven
RUN apk add --no-cache maven openjdk11-jdk
# If we want to run demo again, argument must be modified
ARG CACHEBUST=1
# Copy files
COPY ./model ${ELASTIC_MODEL_HOME}/model
COPY ./cfgfiles ${ELASTIC_MODEL_HOME}/cfgfiles
RUN cp ${ELASTIC_MODEL_HOME}/cfgfiles/log4j2.xml ${DATACLAY_LOG_CONFIG}
# Wait for dataclay to be alive (max retries 10 and 5 seconds per retry)
RUN dataclaycmd WaitForDataClayToBeAlive 10 5
......@@ -37,13 +39,6 @@ RUN dataclaycmd NewDataContract ${USER} ${PASS} ${DATASET} ${USER}
RUN cd ${ELASTIC_MODEL_HOME}/model && mvn package
RUN dataclaycmd NewModel ${USER} ${PASS} ${NAMESPACE} ${MODELBINPATH} java
# Get stubs
RUN mkdir -p ${STUBSPATH}
RUN dataclaycmd GetStubs ${USER} ${PASS} ${NAMESPACE} ${STUBSPATH}
# Package stubs
RUN jar cvf ${STUBS_JAR} -C ${STUBSPATH} .
# Run
ENTRYPOINT ["Nothing to do here"]
......
version: '3.4'
services:
logicmodule:
image: "bscdataclay/logicmodule:2.4"
image: "bscdataclay/logicmodule:2.5.dev-alpine"
ports:
- "11034:11034"
environment:
......@@ -19,7 +19,7 @@ services:
test: ["CMD-SHELL", "/home/dataclayusr/dataclay/health/health_check.sh"]
dsjava:
image: "bscdataclay/dsjava:2.4"
image: "bscdataclay/dsjava:2.5.dev-alpine"
ports:
- "2127:2127"
depends_on:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment