Skip to content

Commit 5c286ac

Browse files
authored
chore: upgrade development image (#2157)
* chore: upgrade development image * fix compability
1 parent e746c05 commit 5c286ac

File tree

10 files changed

+30
-19
lines changed

10 files changed

+30
-19
lines changed

Diff for: .devcontainer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.2
15+
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.3
1616

1717
ARG USERNAME=admin
1818
ARG USER_PASSWORD

Diff for: config_server/service/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.2 as build
15+
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.3 as build
1616

1717
USER root
1818
WORKDIR /src

Diff for: core/dependencies.cmake

+19-8
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ macro(link_spl target_name)
413413

414414
target_link_libraries(${target_name} "libloongcollector_spl.a")
415415
target_link_libraries(${target_name} "libx.a")
416-
target_link_libraries(${target_name} "libpresto_adapters.a")
416+
target_link_libraries(${target_name} "libxx.a")
417417
target_link_libraries(${target_name} "libpresto_common.a")
418418
target_link_libraries(${target_name} "libpresto_exception.a")
419419
target_link_libraries(${target_name} "libpresto_http.a")
@@ -438,7 +438,6 @@ macro(link_spl target_name)
438438
target_link_libraries(${target_name} "libvelox_aggregates.a")
439439
target_link_libraries(${target_name} "libvelox_arrow_bridge.a")
440440
target_link_libraries(${target_name} "libvelox_buffer.a")
441-
target_link_libraries(${target_name} "libvelox_codegen.a")
442441
target_link_libraries(${target_name} "libvelox_common_hyperloglog.a")
443442
target_link_libraries(${target_name} "libvelox_connector.a")
444443
target_link_libraries(${target_name} "libvelox_core.a")
@@ -472,46 +471,56 @@ macro(link_spl target_name)
472471
target_link_libraries(${target_name} "libvelox_functions_lib.a")
473472
target_link_libraries(${target_name} "libvelox_functions_util.a")
474473
target_link_libraries(${target_name} "libvelox_functions_window.a")
474+
target_link_libraries(${target_name} "libvelox_functions_lib_date_time_formatter.a")
475475
target_link_libraries(${target_name} "libvelox_hive_partition_function.a")
476476
target_link_libraries(${target_name} "libvelox_is_null_functions.a")
477477
target_link_libraries(${target_name} "libvelox_memory.a")
478+
target_link_libraries(${target_name} "libvelox_status.a")
478479

479480
target_link_libraries(${target_name} "libvelox_parse_parser.a")
480481
target_link_libraries(${target_name} "libvelox_parse_utils.a")
481482
target_link_libraries(${target_name} "libvelox_process.a")
482483
target_link_libraries(${target_name} "libvelox_row_fast.a")
483484
target_link_libraries(${target_name} "libvelox_rpc.a")
484485
target_link_libraries(${target_name} "libvelox_serialization.a")
485-
target_link_libraries(${target_name} "libvelox_test_util.a")
486486
target_link_libraries(${target_name} "libvelox_time.a")
487487
target_link_libraries(${target_name} "libvelox_tpch_gen.a")
488488
target_link_libraries(${target_name} "libvelox_type.a")
489489
target_link_libraries(${target_name} "libvelox_type_calculation.a")
490490
target_link_libraries(${target_name} "libvelox_type_fbhive.a")
491491
target_link_libraries(${target_name} "libvelox_type_tz.a")
492+
target_link_libraries(${target_name} "libvelox_type_signature.a")
493+
target_link_libraries(${target_name} "libvelox_vector.a")
492494
target_link_libraries(${target_name} "libvelox_vector.a")
493495
target_link_libraries(${target_name} "libvelox_vector_fuzzer.a")
494496
target_link_libraries(${target_name} "libvelox_window.a")
495497
target_link_libraries(${target_name} "libvelox_common_base.a")
496498
target_link_libraries(${target_name} "libvelox_duckdb_parser.a")
497-
target_link_libraries(${target_name} "libvelox_duckdb_allocator.a")
498499
target_link_libraries(${target_name} "libvelox_duckdb_conversion.a")
499-
target_link_libraries(${target_name} "libvelox_duckdb_functions.a")
500+
target_link_libraries(${target_name} "libvelox_signature_parser.a")
501+
target_link_libraries(${target_name} "libvelox_common_compression.a")
500502

501503
target_link_libraries(${target_name} "libvelox_presto_types.a")
502-
target_link_libraries(${target_name} "libdbgen.a")
503504
target_link_libraries(${target_name} "libduckdb.a")
505+
target_link_libraries(${target_name} "libduckdb_utf8proc.a")
506+
target_link_libraries(${target_name} "libduckdb_fmt.a")
507+
target_link_libraries(${target_name} "libduckdb_fastpforlib.a")
508+
target_link_libraries(${target_name} "libduckdb_re2.a")
509+
target_link_libraries(${target_name} "libduckdb_miniz.a")
510+
target_link_libraries(${target_name} "libduckdb_pg_query.a")
511+
target_link_libraries(${target_name} "libduckdb_fsst.a")
512+
target_link_libraries(${target_name} "libduckdb_hyperloglog.a")
513+
target_link_libraries(${target_name} "libduckdb_mbedtls.a")
504514
target_link_libraries(${target_name} "libhttp_filters.a")
505515
target_link_libraries(${target_name} "libmd5.a")
506516
target_link_libraries(${target_name} "libsls_connector_proto.a")
507517
target_link_libraries(${target_name} "libsls_project_version.a")
508-
target_link_libraries(${target_name} "libtpch_extension.a")
518+
target_link_libraries(${target_name} "libjemalloc_extension.a")
509519

510520
target_link_libraries(${target_name} "libproxygen.a")
511521
target_link_libraries(${target_name} "libproxygenhttpserver.a")
512522
target_link_libraries(${target_name} "libglog.a")
513523
target_link_libraries(${target_name} "libfolly.a")
514-
target_link_libraries(${target_name} "libslsprotobuf.a")
515524
target_link_libraries(${target_name} "libuuid.a")
516525
target_link_libraries(${target_name} "libfmt.a")
517526
target_link_libraries(${target_name} "libboost_context.a")
@@ -536,5 +545,7 @@ macro(link_spl target_name)
536545
target_link_libraries(${target_name} "liby.a")
537546
target_link_libraries(${target_name} "libevent.a")
538547
target_link_libraries(${target_name} "libevent_pthreads.a")
548+
target_link_libraries(${target_name} "libapsara_common.a")
549+
target_link_libraries(${target_name} "libbuild_info.a")
539550

540551
endmacro()

Diff for: core/unittest/spl/SplUnittest.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ void SplUnittest::TestRegexCSV() {
410410

411411
void SplUnittest::TestRegexKV() {
412412
// make config
413-
Json::Value config = GetCastConfig(R"(* | parse-kv -delims='&?' content)");
413+
Json::Value config = GetCastConfig(R"(* | parse-kv -regexp content, '(\w+)=(\w+)')");
414414

415415
// make events
416416
auto sourceBuffer = std::make_shared<SourceBuffer>();
@@ -485,7 +485,7 @@ void SplUnittest::TestRegexKV() {
485485

486486
void SplUnittest::TestTag() {
487487
// make config
488-
Json::Value config = GetCastConfig(R"(* | parse-json content | project-rename __tag__:taiye2=a1)");
488+
Json::Value config = GetCastConfig(R"(* | parse-json content | project-rename "__tag__:taiye2"=a1)");
489489

490490
// make events
491491
auto sourceBuffer = std::make_shared<SourceBuffer>();

Diff for: docker/Dockerfile_build

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.2 as build
15+
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.3 as build
1616

1717
USER root
1818
WORKDIR /src

Diff for: docker/Dockerfile_coverage

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.2
15+
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.3
1616

1717
USER root
1818
WORKDIR /src

Diff for: docker/Dockerfile_development_part

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.2
15+
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.3
1616

1717
ARG HOST_OS=Linux
1818
ARG VERSION=0.0.1

Diff for: docker/Dockerfile_e2e

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.2
15+
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.3
1616

1717
ARG HOST_OS=Linux
1818
ARG VERSION=0.0.1

Diff for: docker/Dockerfile_goc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# goc server is only for e2e test to analysis code coverage.
1616

17-
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.2 as build
17+
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.3 as build
1818

1919
USER root
2020
ENTRYPOINT ["goc","server"]

Diff for: docs/cn/developer-guide/development-environment.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ go install ...
8484

8585
```json
8686
{
87-
"image": "sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.2",
87+
"image": "sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.3",
8888
"customizations": {
8989
"vscode": {
9090
"extensions": [
@@ -187,7 +187,7 @@ cp -a ./core/build/go_pipeline/libPluginAdapter.so ./output
187187
```bash
188188
docker run --name loongcollector-build -d \
189189
-v `pwd`:/src -w /src \
190-
sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.2 \
190+
sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.3 \
191191
bash -c "sleep infinity"
192192
```
193193

0 commit comments

Comments
 (0)