Commit a62d356e authored by Michael Vrána's avatar Michael Vrána

Worker Dockerfile and cmake fixes

parent 9b91b0d5
Pipeline #79520 passed with stages
in 5 minutes and 15 seconds
algorithms_JSON_generator
\ No newline at end of file
...@@ -12,7 +12,6 @@ RUN apt update ...@@ -12,7 +12,6 @@ RUN apt update
RUN apt install -y algorithms-library-dev-snapshot RUN apt install -y algorithms-library-dev-snapshot
RUN cmake -DCMAKE_MODULE_PATH=cmake . RUN cmake -DCMAKE_MODULE_PATH=cmake .
RUN make RUN make
RUN ./algorithmsJSONGenerator/algorithms_JSON_generator > algorithms.json
#----------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------
...@@ -20,6 +19,7 @@ FROM xtramike/activemqcpp:debian as alib_web_worker ...@@ -20,6 +19,7 @@ FROM xtramike/activemqcpp:debian as alib_web_worker
WORKDIR /app WORKDIR /app
COPY --from=alib_web_builder /app/alib_web_worker alib_web_worker COPY --from=alib_web_builder /app/alib_web_worker alib_web_worker
COPY worker/entrypoint.sh entrypoint.sh
RUN apt update RUN apt update
RUN apt install -y curl gnupg libjsoncpp1 RUN apt install -y curl gnupg libjsoncpp1
...@@ -29,8 +29,6 @@ RUN apt update ...@@ -29,8 +29,6 @@ RUN apt update
RUN apt install -y algorithms-library-snapshot RUN apt install -y algorithms-library-snapshot
RUN apt autoremove -y curl gnupg RUN apt autoremove -y curl gnupg
RUN echo $'#!/bin/sh \n\ RUN chmod +x entrypoint.sh
/app/alib_web_worker failover:tcp://$(getent hosts alib_web_server | cut -d" " -f1):61616 30000' >> ./entrypoint
RUN chmod +x entrypoint
ENTRYPOINT /app/entrypoint ENTRYPOINT /app/entrypoint.sh
if [ -z "$ALT_WORKER_SERVER" ]; then
echo "ALT_WORKER_SERVER env var unspecified" >&2
exit 1
fi
if [ -z "$ALT_WORKER_TIMEOUT" ]; then
ALT_WORKER_TIMEOUT=15000
fi
/app/alib_web_worker failover:tcp://"${ALT_WORKER_SERVER}" "$ALT_WORKER_TIMEOUT"
add_executable(catch_tests NodeFromJsonBuilderTest.cpp main.cpp topSortTest.cpp AlgorithmEvaluatorTest.cpp StringNodeTest.cpp AutomatonNodeTest.cpp AlgorithmNodeTest.cpp OutputNodeTest.cpp BoolNodeTest.cpp) add_executable(catch_tests NodeFromJsonBuilderTest.cpp main.cpp topSortTest.cpp AlgorithmEvaluatorTest.cpp StringNodeTest.cpp AutomatonNodeTest.cpp AlgorithmNodeTest.cpp OutputNodeTest.cpp BoolNodeTest.cpp)
target_include_directories(catch_tests PUBLIC ../)
target_link_libraries(catch_tests alib_web_worker_lib) target_link_libraries(catch_tests alib_web_worker_lib)
\ No newline at end of file
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