Skip to content

Commit 44b4b82

Browse files
authored
feat build: use new docker image
use new docker image
2 parents 27afb4a + c7cdf5c commit 44b4b82

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
lines changed

CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ add_library(${PROJECT_NAME}_objs OBJECT
2323
src/hello_client.hpp
2424
src/hello_client.cpp
2525
)
26-
target_link_libraries(${PROJECT_NAME}_objs PUBLIC userver-postgresql)
26+
target_link_libraries(${PROJECT_NAME}_objs PUBLIC userver::postgresql)
2727

2828
# Create a proto library with userver extensions
2929
include(GrpcTargets)
@@ -40,15 +40,15 @@ target_link_libraries(${PROJECT_NAME} PRIVATE ${PROJECT_NAME}_objs)
4040
add_executable(${PROJECT_NAME}_unittest
4141
src/hello_test.cpp
4242
)
43-
target_link_libraries(${PROJECT_NAME}_unittest PRIVATE ${PROJECT_NAME}_objs userver-utest)
43+
target_link_libraries(${PROJECT_NAME}_unittest PRIVATE ${PROJECT_NAME}_objs userver::utest)
4444
add_google_tests(${PROJECT_NAME}_unittest)
4545

4646

4747
# Benchmarks
4848
add_executable(${PROJECT_NAME}_benchmark
4949
src/hello_benchmark.cpp
5050
)
51-
target_link_libraries(${PROJECT_NAME}_benchmark PRIVATE ${PROJECT_NAME}_objs userver-ubench)
51+
target_link_libraries(${PROJECT_NAME}_benchmark PRIVATE ${PROJECT_NAME}_objs userver::ubench)
5252
add_google_benchmark_tests(${PROJECT_NAME}_benchmark)
5353

5454

docker-compose.yml

+1-10
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,15 @@ services:
1717
- postgres
1818

1919
pg_grpc_service_template-container:
20-
image: ghcr.io/userver-framework/ubuntu-userver-build-base:v2
20+
image: ghcr.io/userver-framework/ubuntu-22.04-userver-base-ci:latest
2121
privileged: true
2222
environment:
2323
- POSTGRES_DB=pg_grpc_service_template_db-1
2424
- POSTGRES_USER=user
2525
- POSTGRES_PASSWORD=password
2626
- PREFIX=${PREFIX:-~/.local}
27-
- CC
2827
- CCACHE_DIR=/pg_grpc_service_template/.ccache
29-
- CCACHE_HASHDIR
30-
- CCACHE_NOHASHDIR
31-
- CCACHE_PREFIX
32-
- CCACHE_SIZE
33-
- CMAKE_OPTS
3428
- CORES_DIR=/cores
35-
- CXX
36-
- MAKE_OPTS
37-
- CMAKE_COMMON_FLAGS
3829
volumes:
3930
- .:/pg_grpc_service_template:rw
4031
- ./third_party/userver/scripts/docker/:/tools:ro

third_party/userver

Submodule userver updated 187 files

0 commit comments

Comments
 (0)