From 75fca0369cc01693d1380b52172133b826f13db7 Mon Sep 17 00:00:00 2001 From: Thomas Schleicher Date: Tue, 22 Oct 2024 20:08:02 +0200 Subject: [PATCH] try static linking / correct path for Application --- .gitlab-ci.yml | 3 ++- CMakeLists.txt | 2 ++ dockerfile | 4 +--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1218f61..59327f8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,7 +37,8 @@ build_job: package_job: stage: package script: - - docker build -t ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} ${BUILD_DIR} + - cd ${BUILD_DIR} + - docker build -t ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} . - docker save ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} -o ${DOCKER_IMAGE_NAME}.tar only: - main diff --git a/CMakeLists.txt b/CMakeLists.txt index e6f502f..3224701 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,8 @@ project(short-link VERSION 1.0 LANGUAGES CXX) set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD_REQUIRED True) +set(BUILD_SHARED_LIBS OFF) + add_executable(Application src/main.cpp) find_package(Boost REQUIRED COMPONENTS filesystem system) diff --git a/dockerfile b/dockerfile index 0f0cb4d..1b0784d 100644 --- a/dockerfile +++ b/dockerfile @@ -1,11 +1,9 @@ FROM ubuntu:20.04 -ENV BUILD_DIR="build" ENV APPLICATION_BINARY="Application" ENV OPEN_PORT=8080 -WORKDIR /app -COPY ${BUILD_DIR}/${APPLICATION_BINARY} . +COPY ${APPLICATION_BINARY} . EXPOSE ${OPEN_PORT} CMD [ "./${APPLICATION_BINARY}" ] \ No newline at end of file