Add Dockerfile for prod container. Reorganize source tree to be docker-build friendly.

2024-12-14 11:58:02 +00:00 · 2022-02-25 10:03:42 +02:00 · 2022-02-25 10:03:42 +02:00 · b8521828e3
commit b8521828e3
parent e3d7f0a34e
136 changed files with 51 additions and 5 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -0,0 +1,2 @@
+_deps/*
+build-*
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -57,7 +57,7 @@ jobs:
    - name: Build & Test      
      run: |
          cd ${{github.workspace}}/build
-          ninja core/all server/all
+          ninja src/all
          ccache --show-stats
          # GLOG_logtostderr=1 ctest -V -R list_family_test
          echo Run ctest -V -L DFLY
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -31,10 +31,8 @@ add_third_party(

 Message(STATUS "THIRD_PARTY_LIB_DIR ${THIRD_PARTY_LIB_DIR}")

-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(src)
 include_directories(helio)

 add_subdirectory(helio)
-add_subdirectory(core)
-add_subdirectory(redis)
-add_subdirectory(server)
+add_subdirectory(src)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -0,0 +1,3 @@
+add_subdirectory(redis)
+add_subdirectory(core)
+add_subdirectory(server)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
--- a/src/core/compact_object.cc
+++ b/src/core/compact_object.cc
--- a/src/core/compact_object.h
+++ b/src/core/compact_object.h
--- a/src/core/compact_object_test.cc
+++ b/src/core/compact_object_test.cc
--- a/src/core/core_types.h
+++ b/src/core/core_types.h
--- a/src/core/dash.h
+++ b/src/core/dash.h
--- a/src/core/dash_internal.h
+++ b/src/core/dash_internal.h
--- a/src/core/dash_test.cc
+++ b/src/core/dash_test.cc
--- a/src/core/dfly_core_test.cc
+++ b/src/core/dfly_core_test.cc
--- a/src/core/dragonfly_core.cc
+++ b/src/core/dragonfly_core.cc
--- a/src/core/intent_lock.h
+++ b/src/core/intent_lock.h
--- a/src/core/interpreter.cc
+++ b/src/core/interpreter.cc
--- a/src/core/interpreter.h
+++ b/src/core/interpreter.h
--- a/src/core/interpreter_test.cc
+++ b/src/core/interpreter_test.cc
--- a/src/core/mi_memory_resource.h
+++ b/src/core/mi_memory_resource.h
--- a/src/core/op_status.h
+++ b/src/core/op_status.h
--- a/src/core/resp_expr.h
+++ b/src/core/resp_expr.h
--- a/src/core/segment_allocator.cc
+++ b/src/core/segment_allocator.cc
--- a/src/core/segment_allocator.h
+++ b/src/core/segment_allocator.h
--- a/src/core/small_string.cc
+++ b/src/core/small_string.cc
--- a/src/core/small_string.h
+++ b/src/core/small_string.h
--- a/src/core/tx_queue.cc
+++ b/src/core/tx_queue.cc
--- a/src/core/tx_queue.h
+++ b/src/core/tx_queue.h
--- a/src/redis/CMakeLists.txt
+++ b/src/redis/CMakeLists.txt
--- a/src/redis/LICENSE.redis
+++ b/src/redis/LICENSE.redis
--- a/src/redis/atomicvar.h
+++ b/src/redis/atomicvar.h
--- a/src/redis/config.h
+++ b/src/redis/config.h
--- a/src/redis/crc64.c
+++ b/src/redis/crc64.c
--- a/src/redis/crc64.h
+++ b/src/redis/crc64.h
--- a/src/redis/crcspeed.c
+++ b/src/redis/crcspeed.c
--- a/src/redis/crcspeed.h
+++ b/src/redis/crcspeed.h
--- a/src/redis/debug.c
+++ b/src/redis/debug.c
--- a/src/redis/dict.c
+++ b/src/redis/dict.c
--- a/src/redis/dict.h
+++ b/src/redis/dict.h
--- a/src/redis/endianconv.c
+++ b/src/redis/endianconv.c
--- a/src/redis/endianconv.h
+++ b/src/redis/endianconv.h
--- a/src/redis/intset.c
+++ b/src/redis/intset.c
--- a/src/redis/intset.h
+++ b/src/redis/intset.h
--- a/src/redis/listpack.c
+++ b/src/redis/listpack.c
--- a/src/redis/listpack.h
+++ b/src/redis/listpack.h
--- a/src/redis/lzf.h
+++ b/src/redis/lzf.h
--- a/src/redis/lzfP.h
+++ b/src/redis/lzfP.h
--- a/src/redis/lzf_c.c
+++ b/src/redis/lzf_c.c
--- a/src/redis/lzf_d.c
+++ b/src/redis/lzf_d.c
--- a/src/redis/mt19937-64.c
+++ b/src/redis/mt19937-64.c
--- a/src/redis/mt19937-64.h
+++ b/src/redis/mt19937-64.h
--- a/src/redis/object.c
+++ b/src/redis/object.c
--- a/src/redis/object.h
+++ b/src/redis/object.h
--- a/src/redis/quicklist.c
+++ b/src/redis/quicklist.c
--- a/src/redis/quicklist.h
+++ b/src/redis/quicklist.h
--- a/src/redis/rdb.h
+++ b/src/redis/rdb.h
--- a/src/redis/redis_aux.c
+++ b/src/redis/redis_aux.c
--- a/src/redis/redis_aux.h
+++ b/src/redis/redis_aux.h
--- a/src/redis/sds.c
+++ b/src/redis/sds.c
--- a/src/redis/sds.h
+++ b/src/redis/sds.h
--- a/src/redis/sdsalloc.h
+++ b/src/redis/sdsalloc.h
--- a/src/redis/sha256.c
+++ b/src/redis/sha256.c
--- a/src/redis/sha256.h
+++ b/src/redis/sha256.h
--- a/src/redis/siphash.c
+++ b/src/redis/siphash.c
--- a/src/redis/t_zset.c
+++ b/src/redis/t_zset.c
--- a/src/redis/util.c
+++ b/src/redis/util.c
--- a/src/redis/util.h
+++ b/src/redis/util.h
--- a/src/redis/zmalloc.c
+++ b/src/redis/zmalloc.c
--- a/src/redis/zmalloc.h
+++ b/src/redis/zmalloc.h
--- a/src/redis/zmalloc_mi.c
+++ b/src/redis/zmalloc_mi.c
--- a/src/redis/zset.h
+++ b/src/redis/zset.h
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
--- a/src/server/command_registry.cc
+++ b/src/server/command_registry.cc
--- a/src/server/command_registry.h
+++ b/src/server/command_registry.h
--- a/src/server/common.cc
+++ b/src/server/common.cc
--- a/src/server/common_types.h
+++ b/src/server/common_types.h
--- a/src/server/config_flags.cc
+++ b/src/server/config_flags.cc
--- a/src/server/config_flags.h
+++ b/src/server/config_flags.h
--- a/src/server/conn_context.cc
+++ b/src/server/conn_context.cc
--- a/src/server/conn_context.h
+++ b/src/server/conn_context.h
--- a/src/server/db_slice.cc
+++ b/src/server/db_slice.cc
--- a/src/server/db_slice.h
+++ b/src/server/db_slice.h
--- a/src/server/debugcmd.cc
+++ b/src/server/debugcmd.cc
--- a/src/server/debugcmd.h
+++ b/src/server/debugcmd.h
--- a/src/server/detail/table.h
+++ b/src/server/detail/table.h
--- a/src/server/dfly_main.cc
+++ b/src/server/dfly_main.cc
--- a/src/server/dragonfly_connection.cc
+++ b/src/server/dragonfly_connection.cc
--- a/src/server/dragonfly_connection.h
+++ b/src/server/dragonfly_connection.h
--- a/src/server/dragonfly_listener.cc
+++ b/src/server/dragonfly_listener.cc
--- a/src/server/dragonfly_listener.h
+++ b/src/server/dragonfly_listener.h
--- a/src/server/dragonfly_test.cc
+++ b/src/server/dragonfly_test.cc
--- a/src/server/engine_shard_set.cc
+++ b/src/server/engine_shard_set.cc
--- a/src/server/engine_shard_set.h
+++ b/src/server/engine_shard_set.h
--- a/src/server/error.h
+++ b/src/server/error.h
--- a/src/server/generic_family.cc
+++ b/src/server/generic_family.cc
--- a/src/server/generic_family.h
+++ b/src/server/generic_family.h
--- a/src/server/generic_family_test.cc
+++ b/src/server/generic_family_test.cc
--- a/src/server/global_state.h
+++ b/src/server/global_state.h
--- a/src/server/list_family.cc
+++ b/src/server/list_family.cc
--- a/src/server/list_family.h
+++ b/src/server/list_family.h
--- a/src/server/list_family_test.cc
+++ b/src/server/list_family_test.cc
--- a/Show more
+++ b/Show more