Skip to content

Commit

Permalink
feat build: update userver and docker image
Browse files Browse the repository at this point in the history
  • Loading branch information
alexiprof committed Apr 11, 2024
1 parent edcb369 commit 510fb09
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 14 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ add_library(${PROJECT_NAME}_objs OBJECT
src/hello.hpp
src/hello.cpp
)
target_link_libraries(${PROJECT_NAME}_objs PUBLIC userver-core)
target_link_libraries(${PROJECT_NAME}_objs PUBLIC userver::core)


# The Service
Expand All @@ -29,15 +29,15 @@ target_link_libraries(${PROJECT_NAME} PRIVATE ${PROJECT_NAME}_objs)
add_executable(${PROJECT_NAME}_unittest
src/hello_test.cpp
)
target_link_libraries(${PROJECT_NAME}_unittest PRIVATE ${PROJECT_NAME}_objs userver-utest)
target_link_libraries(${PROJECT_NAME}_unittest PRIVATE ${PROJECT_NAME}_objs userver::utest)
add_google_tests(${PROJECT_NAME}_unittest)


# Benchmarks
add_executable(${PROJECT_NAME}_benchmark
src/hello_benchmark.cpp
)
target_link_libraries(${PROJECT_NAME}_benchmark PRIVATE ${PROJECT_NAME}_objs userver-ubench)
target_link_libraries(${PROJECT_NAME}_benchmark PRIVATE ${PROJECT_NAME}_objs userver::ubench)
add_google_benchmark_tests(${PROJECT_NAME}_benchmark)


Expand Down
11 changes: 1 addition & 10 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,13 @@ version: "2.3"

services:
service_template-container:
image: ghcr.io/userver-framework/ubuntu-userver-build-base:v1
image: ghcr.io/userver-framework/ubuntu-22.04-userver-base-ci:latest
privileged: true
network_mode: bridge
environment:
- PREFIX=${PREFIX:-~/.local}
- CC
- CCACHE_DIR=/service_template/.ccache
- CCACHE_HASHDIR
- CCACHE_NOHASHDIR
- CCACHE_PREFIX
- CCACHE_SIZE
- CMAKE_OPTS
- CORES_DIR=/cores
- CXX
- MAKE_OPTS
- CMAKE_COMMON_FLAGS
volumes:
- .:/service_template:rw
- ./third_party/userver/tools/docker:/tools:ro
Expand Down
2 changes: 1 addition & 1 deletion third_party/userver
Submodule userver updated 1007 files

0 comments on commit 510fb09

Please sign in to comment.