mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
use again prebuild dependencies, but with code mounted from filesystem
This commit is contained in:
parent
0c68dbde9d
commit
c463a15db2
@ -34,7 +34,7 @@ services:
|
|||||||
- ./logs:/var/log/grd_login
|
- ./logs:/var/log/grd_login
|
||||||
- ./login_server/src:/code/src
|
- ./login_server/src:/code/src
|
||||||
- ./configs/login_server:/etc/grd_login
|
- ./configs/login_server:/etc/grd_login
|
||||||
- login_build:/code/build
|
- login_build_conan:/code/build_vol
|
||||||
- conan:/root/.conan
|
- conan:/root/.conan
|
||||||
|
|
||||||
|
|
||||||
@ -100,6 +100,6 @@ services:
|
|||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
frontend_node_modules:
|
frontend_node_modules:
|
||||||
login_build:
|
login_build_conan:
|
||||||
conan:
|
conan:
|
||||||
|
|
||||||
|
|||||||
@ -1,32 +1,42 @@
|
|||||||
|
|
||||||
#########################################################################################################
|
#########################################################################################################
|
||||||
# debug build preparation
|
# Build debug
|
||||||
#########################################################################################################
|
#########################################################################################################
|
||||||
From conanio/gcc9 as build_debug_preparation
|
From gradido/login_dependencies:stage2 as debug
|
||||||
USER root
|
|
||||||
|
|
||||||
ENV DOCKER_WORKDIR="/code"
|
ENV DOCKER_WORKDIR="/code"
|
||||||
|
|
||||||
RUN mkdir -p ${DOCKER_WORKDIR}
|
USER root
|
||||||
|
|
||||||
WORKDIR ${DOCKER_WORKDIR}
|
WORKDIR ${DOCKER_WORKDIR}
|
||||||
|
COPY . .
|
||||||
|
|
||||||
COPY . .
|
RUN chmod +x unix_parse_proto.sh
|
||||||
|
RUN chmod +x compile_pot.sh
|
||||||
|
|
||||||
|
RUN ./compile_pot.sh
|
||||||
|
RUN ./unix_parse_proto.sh
|
||||||
|
|
||||||
RUN cd dependencies/mariadb-connector-c && \
|
|
||||||
mkdir build && \
|
|
||||||
cd build && \
|
|
||||||
cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_SSL=OFF ..
|
|
||||||
|
|
||||||
#########################################################################################################
|
#########################################################################################################
|
||||||
# run debug
|
# run debug
|
||||||
#########################################################################################################
|
#########################################################################################################
|
||||||
FROM build_debug_preparation as login_server_debug
|
FROM debug as login_server_debug
|
||||||
|
|
||||||
ENV DOCKER_WORKDIR="/code"
|
ENV DOCKER_WORKDIR="/code"
|
||||||
|
#RUN apt-get update && \
|
||||||
|
# apt-get install -y --no-install-recommends gdb && \
|
||||||
|
# apt-get autoclean && \
|
||||||
|
# apt-get autoremove && \
|
||||||
|
# apt-get clean && \
|
||||||
|
# rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
VOLUME /var/log/grd_login
|
||||||
|
VOLUME /code/src
|
||||||
|
|
||||||
EXPOSE 1200
|
EXPOSE 1200
|
||||||
EXPOSE 1201
|
EXPOSE 1201
|
||||||
WORKDIR ${DOCKER_WORKDIR}
|
WORKDIR ${DOCKER_WORKDIR}
|
||||||
RUN chmod +x ./Dockerfiles/build_and_run.sh
|
RUN chmod +x ./Dockerfiles/build_and_run.sh
|
||||||
|
|
||||||
CMD ./Dockerfiles/build_and_run.sh; ./build/bin/Gradido_LoginServer
|
CMD ./Dockerfiles/build_and_run.sh; ./build_vol/bin/Gradido_LoginServer
|
||||||
|
|||||||
@ -1,5 +1,17 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
cp build/conan* build_vol/
|
||||||
|
cd build_vol
|
||||||
|
|
||||||
|
cmake -DCMAKE_BUILD_TYPE=Debug ..
|
||||||
|
cmake ..
|
||||||
|
make -j$(nproc) Gradido_LoginServer
|
||||||
|
#echo "building done"
|
||||||
|
chmod +x ./bin/Gradido_LoginServer
|
||||||
|
#./bin/Gradido_LoginServer
|
||||||
|
|
||||||
|
|
||||||
|
: '
|
||||||
cd build
|
cd build
|
||||||
conan install .. --build=missing -s build_type=Debug
|
conan install .. --build=missing -s build_type=Debug
|
||||||
cmake -DCMAKE_BUILD_TYPE=Debug ..
|
cmake -DCMAKE_BUILD_TYPE=Debug ..
|
||||||
@ -21,3 +33,4 @@ make -j$(nproc) Gradido_LoginServer
|
|||||||
#echo "building done"
|
#echo "building done"
|
||||||
chmod +x ./bin/Gradido_LoginServer
|
chmod +x ./bin/Gradido_LoginServer
|
||||||
#./bin/Gradido_LoginServer
|
#./bin/Gradido_LoginServer
|
||||||
|
'
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user