Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat build: update userver and docker image #65

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
13 changes: 2 additions & 11 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,16 @@ 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
- ./third_party/userver/scripts/docker/:/tools:ro
ports:
- 8080:8080
working_dir: /service_template
Expand Down
2 changes: 1 addition & 1 deletion third_party/userver
Submodule userver updated 1007 files
Loading