diff --git a/Dockerfile.debug b/Dockerfile.debug index 0c4352559..0c7c741d5 100644 --- a/Dockerfile.debug +++ b/Dockerfile.debug @@ -34,7 +34,9 @@ COPY --from=protoc_build /protobuf/src/google/protobuf/*.h /usr/include/google/p RUN mkdir -p ${DOCKER_WORKDIR} WORKDIR ${DOCKER_WORKDIR} -COPY . . +COPY ./dependencies ./dependencies +COPY ./conanfile.txt ./conanfile.txt + RUN ls -la RUN cd dependencies/iroha-ed25519 && \ ls -la && \ @@ -49,11 +51,11 @@ RUN cd dependencies/mariadb-connector-c && \ cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_SSL=OFF .. -RUN chmod +x compile_proto.sh -RUN chmod +x compile_pot.sh -RUN ls -la -RUN ./compile_pot.sh -RUN ./compile_proto.sh +#RUN chmod +x compile_proto.sh +#RUN chmod +x compile_pot.sh +#RUN ls -la +#RUN ./compile_pot.sh +#RUN ./compile_proto.sh RUN mkdir build && \ cd build && \ conan install .. --build=missing -s build_type=Debug @@ -84,10 +86,16 @@ RUN apt-get update && \ #COPY --from=debug_preparation /code /code #COPY --from=debug_preparation /home/conan /home/conan #RUN ls -la /home/conan/.conan +COPY . . WORKDIR ${DOCKER_WORKDIR} #RUN ls -la #RUN cat build/conanbuildinfo.cmake +RUN chmod +x compile_proto.sh +RUN chmod +x compile_pot.sh +#RUN ls -la +RUN ./compile_pot.sh +RUN ./compile_proto.sh RUN cd build && \ cmake -DCMAKE_BUILD_TYPE=Debug .. && \ make -j$(grep processor /proc/cpuinfo | wc -l) @@ -100,12 +108,12 @@ FROM ubuntu:latest as login_server_debug WORKDIR "/usr/bin" -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/* +#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 @@ -120,4 +128,5 @@ EXPOSE 1201 #CMD ["sleep 5", "/usr/bin/Gradido_LoginServer"] #RUN chmod +x ./start_after_mysql.sh #ENTRYPOINT ["/usr/bin/Gradido_LoginServer"] -CMD gdb -ex=r Gradido_LoginServer \ No newline at end of file +#CMD gdb -ex=r Gradido_LoginServer +CMD Gradido_LoginServer \ No newline at end of file diff --git a/src/cpp/model/Session.cpp b/src/cpp/model/Session.cpp index d28b161cf..86fad389c 100644 --- a/src/cpp/model/Session.cpp +++ b/src/cpp/model/Session.cpp @@ -1110,7 +1110,8 @@ Poco::Net::HTTPCookie Session::getLoginCookie() { auto keks = Poco::Net::HTTPCookie("GRADIDO_LOGIN", std::to_string(mHandleId)); // prevent reading or changing cookie with js - keks.setHttpOnly(); +// keks.setHttpOnly(); + keks.setPath("/"); // send cookie only via https, on linux, except in test builds #ifndef WIN32