mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-12 23:35:50 +00:00
fix login server build speed
This commit is contained in:
parent
227809d5b5
commit
7e03c6204c
@ -50,7 +50,6 @@ services:
|
||||
#########################################################
|
||||
phpmyadmin:
|
||||
image: phpmyadmin
|
||||
container_name: phpmyadmin
|
||||
environment:
|
||||
- PMA_ARBITRARY=1
|
||||
#restart: always
|
||||
@ -70,7 +69,6 @@ services:
|
||||
context: .
|
||||
dockerfile: ./skeema/Dockerfile
|
||||
target: skeema_run
|
||||
container_name: skeema
|
||||
depends_on:
|
||||
- mariadb
|
||||
networks:
|
||||
|
||||
@ -39,7 +39,6 @@ services:
|
||||
context: .
|
||||
dockerfile: ./mariadb/Dockerfile
|
||||
target: mariadb_server
|
||||
container_name: mariadb
|
||||
environment:
|
||||
- MARIADB_ALLOW_EMPTY_PASSWORD=1
|
||||
- MARIADB_USER=root
|
||||
@ -57,7 +56,6 @@ services:
|
||||
build:
|
||||
context: ./login_server/
|
||||
target: login_server
|
||||
container_name: login-server
|
||||
depends_on:
|
||||
- mariadb
|
||||
networks:
|
||||
@ -77,7 +75,6 @@ services:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: ./nginx/Dockerfile
|
||||
container_name: nginx
|
||||
networks:
|
||||
- external-net
|
||||
- internal-net
|
||||
@ -94,7 +91,6 @@ services:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: ./community_server/Dockerfile
|
||||
container_name: community-server
|
||||
environment:
|
||||
- DB_PASSWORD=''
|
||||
- DB_USER='root'
|
||||
|
||||
@ -2,39 +2,28 @@
|
||||
#########################################################################################################
|
||||
# Build debug
|
||||
#########################################################################################################
|
||||
From gradido/login_dependencies:stage2 as build_debug
|
||||
From gradido/login_dependencies:stage2 as debug
|
||||
|
||||
ENV DOCKER_WORKDIR="/code"
|
||||
|
||||
USER root
|
||||
|
||||
WORKDIR ${DOCKER_WORKDIR}
|
||||
COPY . .
|
||||
|
||||
COPY ./src/cpp ./src/cpp
|
||||
COPY ./src/LOCALE ./src/LOCALE
|
||||
COPY ./compile_pot.sh .
|
||||
COPY ./files_to_translate.txt .
|
||||
COPY ./src/proto ./src/proto
|
||||
COPY ./unix_parse_proto.sh .
|
||||
RUN chmod +x unix_parse_proto.sh
|
||||
RUN chmod +x compile_pot.sh
|
||||
|
||||
RUN chmod +x unix_parse_proto.sh && \
|
||||
./unix_parse_proto.sh
|
||||
RUN ./compile_pot.sh
|
||||
RUN ./unix_parse_proto.sh
|
||||
|
||||
RUN chmod +x compile_pot.sh && \
|
||||
./compile_pot.sh
|
||||
|
||||
RUN cd build && \
|
||||
cmake -DCMAKE_BUILD_TYPE=Debug .. && \
|
||||
make -j$(nproc)
|
||||
|
||||
CMD bash
|
||||
|
||||
#########################################################################################################
|
||||
# run debug
|
||||
#########################################################################################################
|
||||
FROM ubuntu:latest as login_server_debug
|
||||
|
||||
WORKDIR "/usr/bin"
|
||||
FROM debug as login_server_debug
|
||||
|
||||
ENV DOCKER_WORKDIR="/code"
|
||||
#RUN apt-get update && \
|
||||
# apt-get install -y --no-install-recommends gdb && \
|
||||
# apt-get autoclean && \
|
||||
@ -43,13 +32,11 @@ WORKDIR "/usr/bin"
|
||||
# rm -rf /var/lib/apt/lists/*
|
||||
|
||||
VOLUME /var/log/grd_login
|
||||
VOLUME /code/src
|
||||
|
||||
COPY --from=build_debug /code/build/bin/Gradido_LoginServer /usr/bin/
|
||||
COPY --from=build_debug /code/build/lib/libmariadb.so.3 /usr/lib/
|
||||
#COPY --from=build_debug /code/build/lib/libPocoNetSSLd.so.64 /usr/lib/libPocoNetSSLd.so.64
|
||||
RUN chmod +x /usr/bin/Gradido_LoginServer
|
||||
EXPOSE 1200
|
||||
EXPOSE 1201
|
||||
WORKDIR ${DOCKER_WORKDIR}
|
||||
RUN chmod +x ./Dockerfiles/build_and_run.sh
|
||||
|
||||
#CMD gdb -ex=r Gradido_LoginServer
|
||||
CMD ./Dockerfiles/build_and_run.sh; ./build_vol/bin/Gradido_LoginServer
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user