diff options
| author | Shauren <shauren.trinity@gmail.com> | 2023-05-20 13:57:57 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2024-02-26 12:26:36 +0100 |
| commit | 4fdd4079436178f346ba19616b50e515215825ea (patch) | |
| tree | c0822711f18c57d49b520aec404db5395e798d6e | |
| parent | 4d220221bf6c55c1e0e1ae4bbdfc386e9d88c52c (diff) | |
Docker: Fixed files being missing from circleci built images
(cherry picked from commit 907d9f1a79b838b043420f11a9a2122e3fa155c7)
| -rw-r--r-- | .circleci/config.yml | 12 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | contrib/Docker/Dockerfile | 3 |
3 files changed, 9 insertions, 8 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index ba401c2de74..f5a8bd07370 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -53,9 +53,9 @@ jobs: mkdir bin cd bin if [ "$DOCKERHUB_PUSH_IMAGES" == "TRUE" ]; then - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DNOJEM=0 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_INSTALL_PREFIX=check_install -DBUILD_TESTING=1 + cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DNOJEM=0 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_INSTALL_PREFIX=check_install -DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib -DBUILD_TESTING=1 else - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DNOJEM=0 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install -DBUILD_TESTING=1 + cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DNOJEM=0 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install -DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib -DBUILD_TESTING=1 fi cd .. - run: @@ -79,13 +79,13 @@ jobs: - run: name: Create docker images command: | - cd bin/check_install/bin - cp -r ../../../contrib/Docker/* . - cp -r ../../../sql ./sql + cd bin/check_install + cp -r ../../contrib/Docker/* . + cp -r ../../sql ./sql image_prefix=$(echo $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME | tr '[:upper:]' '[:lower:]') echo $image_prefix docker build --file Dockerfile --force-rm --tag $image_prefix:$CIRCLE_SHA1 --tag $image_prefix:$(echo $CIRCLE_BRANCH | tr '/' '-' | tr '[:upper:]' '[:lower:]') . - docker save $image_prefix | gzip > ../../../docker.tar.gz + docker save $image_prefix | gzip > ../../docker.tar.gz if [ "$DOCKERHUB_PUSH_IMAGES" == "TRUE" ]; then if [ "$CIRCLE_BRANCH" == "3.3.5" ] || [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "wotlk_classic" ]; then docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD diff --git a/CMakeLists.txt b/CMakeLists.txt index e6638a98c97..65a707cc87f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ cmake_policy(SET CMP0074 NEW) # find_package() uses <PackageName>_ROOT variables # Set RPATH-handing (CMake parameters) set(CMAKE_SKIP_BUILD_RPATH 0) set(CMAKE_BUILD_WITH_INSTALL_RPATH 0) -set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") +list(APPEND CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1) # set macro-directory diff --git a/contrib/Docker/Dockerfile b/contrib/Docker/Dockerfile index 2460d1b2833..6cdc0b1e09c 100644 --- a/contrib/Docker/Dockerfile +++ b/contrib/Docker/Dockerfile @@ -4,5 +4,6 @@ FROM trinitycore/circle-ci:3.3.5-base-22.04 WORKDIR /home/circleci COPY README.md / COPY --chown=circleci:circleci sql /home/circleci/project/sql -COPY ["authserver", "mapextractor", "mmaps_generator", "vmap4assembler", "vmap4extractor", "worldserver", "/usr/local/bin/"] +COPY bin /usr/local/bin/ +COPY lib /usr/local/lib/ ENTRYPOINT [ "echo", "Check the README.md file for instructions"] |