@@ -6,12 +6,12 @@ RUN apt-get -y update && apt-get -y install build-essential git python3-pip wget
66ADD . mist/
77
88# logging level is set to just 3, not 6 or whatever
9- RUN cd /mist && meson setup build -DDEBUG=3 --default-library static && \
9+ RUN cd /mist && meson setup build -DDEBUG=3 -Dcpp_std=c++17 - -default-library static && \
1010 cd build && ninja install && \
1111 mkdir -p /app/mistserver && \
12- cd /mist/build && cp $(ls | grep -v .p | grep Mist) /app/mistserver
12+ cd /mist/build && mv $(ls | grep -v .p | grep Mist) /app/mistserver
1313
14- # --------
14+ # --------
1515
1616FROM public.ecr.aws/ubuntu/ubuntu:22.04 AS buildDebug
1717
@@ -20,24 +20,27 @@ RUN apt-get -y update && apt-get -y install build-essential git python3-pip wget
2020
2121ADD . mist/
2222
23- RUN cd /mist && meson setup build --default-library static && \
23+ RUN cd /mist && meson setup build -Dcpp_std=c++17 - -default-library static && \
2424 cd build && ninja install && \
2525 mkdir -p /app/mistserver && \
26- cd /mist/build && cp $(ls | grep -v .p | grep Mist) /app/mistserver
26+ cd /mist/build && mv $(ls | grep -v .p | grep Mist) /app/mistserver
2727
28- # --------
28+ # --------
2929
30- FROM public.ecr.aws/ubuntu/ubuntu:22.04 AS deploy
31-
32- RUN mkdir -p /config /media /app
33-
34- WORKDIR /app
30+ FROM public.ecr.aws/ubuntu/ubuntu:22.04 AS deploy
3531
3632ENTRYPOINT ["/app/mistserver-prod/MistController" , "-c" , "/config/server.conf" ]
3733
38- # seems to be not needed
39- # ENV PATH /app/mistserver:$PATH
40-
4134COPY --from=buildDebug /app/mistserver /app/mistserver-debug
4235COPY --from=buildProd /app/mistserver /app/mistserver-prod
4336
37+ # for each mist container, we will run Controller with different path
38+ # so it will be easier to understand relation of the process to particular container
39+ RUN mkdir -p /config /media /app && \
40+ mkdir -p /app/mistserver-debug-1 /app/mistserver-debug-2 && \
41+ mkdir -p /app/mistserver-prod-1 /app/mistserver-prod-2 && \
42+ ln -s /app/mistserver-debug/* /app/mistserver-debug-1 && ln -s /app/mistserver-debug/* /app/mistserver-debug-2 && \
43+ ln -s /app/mistserver-prod/* /app/mistserver-prod-1 && ln -s /app/mistserver-prod/* /app/mistserver-prod-2 && \
44+ echo "symlinks created"
45+
46+ WORKDIR /app
0 commit comments