From 69ac88ccf68ef89cc98f51662d67182a295a9177 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 16 Jun 2021 16:06:31 +0200 Subject: [PATCH] fill missing files --- .github/workflows/test.yml | 2 +- docker-compose.override.yml | 3 +- docker-compose.test.yml | 2 +- docker-compose.yml | 1 - login_server/Dockerfiles/Dockerfile.default | 58 ------------------- .../Dockerfiles/ubuntu/Dockerfile.release | 49 ++++++++++++++++ 6 files changed, 52 insertions(+), 63 deletions(-) delete mode 100644 login_server/Dockerfiles/Dockerfile.default diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ea16c73c8..3fe5c5abb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -294,7 +294,7 @@ jobs: run: echo "::set-output name=id::$(docker network ls | grep github_network | awk '{ print $1 }')" id: network - name: Start Login-Server - run: docker run --network ${{ steps.network.outputs.id }} --name=login-server -d gradido/login_server:latest + run: docker run --network ${{ steps.network.outputs.id }} --name=login-server -d gradido/login_server:with-config - name: get login-server container id run: echo "::set-output name=id::$(docker container ls | grep login_server | awk '{ print $1 }')" id: login_server_container diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 1060002ba..dfc980a86 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -26,8 +26,7 @@ services: ######################################################### login-server: build: - target: login_server_alpine_debug - dockerfile: Dockerfile.alpine-debug + dockerfile: Dockerfiles/alpine/Dockerfile.debug security_opt: - seccomp:unconfined cap_add: diff --git a/docker-compose.test.yml b/docker-compose.test.yml index b9d44363e..457faf950 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -26,7 +26,7 @@ services: login-server: build: context: ./login_server/ - target: test + dockerfile: Dockerfiles/ubuntu/Dockerfile.test security_opt: - seccomp:unconfined cap_add: diff --git a/docker-compose.yml b/docker-compose.yml index 2cc2ceff7..35e015f4e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,7 +55,6 @@ services: login-server: build: context: ./login_server/ - target: login_server depends_on: - mariadb networks: diff --git a/login_server/Dockerfiles/Dockerfile.default b/login_server/Dockerfiles/Dockerfile.default deleted file mode 100644 index 4be44dfd0..000000000 --- a/login_server/Dockerfiles/Dockerfile.default +++ /dev/null @@ -1,58 +0,0 @@ - -######################################################################################################### -# Build release -######################################################################################################### -FROM gradido/login_dependencies:alpine-release-3 as release_default - -ENV DOCKER_WORKDIR="/code" -WORKDIR ${DOCKER_WORKDIR} - -COPY ./login_server/CMakeLists.txt.lib ./CMakeLists.txt -COPY ./login_server/src ./src -COPY ./login_server/dependencies/cmake-modules ./dependencies/cmake-modules -COPY ./login_server/dependencies/spirit-po ./dependencies/spirit-po -COPY ./login_server/dependencies/tinf ./dependencies/tinf -COPY ./login_server/scripts ./scripts - -RUN mkdir build && \ - cd build && \ - cmake -DCMAKE_BUILD_TYPE=Release .. && \ - make -j$(nproc) Gradido_LoginServer - -RUN cd scripts && \ - chmod +x compile_pot.sh && \ - ./compile_pot.sh - - -######################################################################################################### -# run release with docker default config -######################################################################################################### -#From alpine:latest as login_server -FROM alpine:3.13.5 as login_server_default - -USER root -WORKDIR "/usr/bin" - -COPY --from=release_default /code/build/bin/Gradido_LoginServer /usr/bin/ - -COPY --from=release_default /usr/local/lib/mariadb/libmariadb.so.3 /usr/local/lib/ -COPY --from=release_default /usr/local/lib/libPoco* /usr/local/lib/ -COPY --from=release_default /usr/lib/libsodium.so.23 /usr/lib/ -COPY --from=release_default /usr/lib/libstdc++.so.6 /usr/lib/ -COPY --from=release_default /usr/lib/libgcc_s.so.1 /usr/lib/ - -COPY ./configs/login_server/grd_login.properties /etc/grd_login/ -COPY ./configs/login_server/cacert.pem /etc/grd_login/ -COPY ./configs/login_server/LOCALE /etc/grd_login/ - -EXPOSE 1200 -EXPOSE 1201 - -RUN chmod +x /usr/bin/Gradido_LoginServer -ENTRYPOINT ["/usr/bin/Gradido_LoginServer"] -#CMD Gradido_LoginServer - - - - - diff --git a/login_server/Dockerfiles/ubuntu/Dockerfile.release b/login_server/Dockerfiles/ubuntu/Dockerfile.release index e69de29bb..aa727c59c 100644 --- a/login_server/Dockerfiles/ubuntu/Dockerfile.release +++ b/login_server/Dockerfiles/ubuntu/Dockerfile.release @@ -0,0 +1,49 @@ + +######################################################################################################### +# Build release +######################################################################################################### +FROM gradido/login_dependencies:ubuntu-release-3 as release + +ENV DOCKER_WORKDIR="/code" +WORKDIR ${DOCKER_WORKDIR} + +COPY ./CMakeLists.txt.lib ./CMakeLists.txt +COPY ./src ./src +RUN ln -s /usr/local/googletest ./googletest +COPY ./dependencies/cmake-modules ./dependencies/cmake-modules +COPY ./dependencies/spirit-po ./dependencies/spirit-po +COPY ./dependencies/tinf ./dependencies/tinf +COPY ./scripts ./scripts + +RUN mkdir build && \ + cd build && \ + cmake -DCMAKE_BUILD_TYPE=Release .. && \ + make -j$(nproc) Gradido_LoginServer + +RUN cd scripts && \ + chmod +x compile_pot.sh && \ + ./compile_pot.sh + + +######################################################################################################### +# run release +######################################################################################################### +#From alpine:latest as login_server +FROM ubuntu:latest as login_server + +USER root +WORKDIR "/usr/bin" + +COPY --from=release /code/build/bin/Gradido_LoginServer /usr/bin/ + +COPY --from=release /usr/local/lib/mariadb/libmariadb.so.3 /usr/local/lib/ +COPY --from=release /usr/local/lib/libPoco* /usr/local/lib/ +COPY --from=release /usr/local/lib/libproto* /usr/local/lib/ +COPY --from=release /usr/lib/libsodium.so.23 /usr/lib/ +COPY --from=release /usr/lib/libstdc++.so.6 /usr/lib/ +COPY --from=release /usr/lib/libgcc_s.so.1 /usr/lib/ + + +RUN chmod +x /usr/bin/Gradido_LoginServer +ENTRYPOINT ["/usr/bin/Gradido_LoginServer"] +#CMD Gradido_LoginServer