Skip to content

Commit c960809

Browse files
authored
feat: update loongcollector-build-linux 2.1.15 -> 2.1.16, support spl 2.13.2 (alibaba#2552)
* feat: update loongcollector-build-linux 2.1.15 -> 2.1.16, support spl 2.13.2 * feat: update loongcollector-build-linux 2.1.15 -> 2.1.16, support spl 2.13.2 * feat: update loongcollector-build-linux 2.1.15 -> 2.1.16, support spl 2.13.2
1 parent c86fda7 commit c960809

9 files changed

Lines changed: 16 additions & 91 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
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.15
15+
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.16
1616

1717
ARG USERNAME=admin
1818
ARG USER_PASSWORD

.devcontainer/Dockerfile.lldb

Lines changed: 1 addition & 1 deletion
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.15
15+
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.16
1616

1717
ARG USERNAME=admin
1818
ARG USER_PASSWORD

core/dependencies.cmake

Lines changed: 5 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -765,12 +765,12 @@ endmacro()
765765
macro(link_spl target_name)
766766
logtail_define(spl_${target_name} "" "")
767767

768-
find_library(LIB_FOUND "libloongcollector_spl_2.11.6.a")
768+
find_library(LIB_FOUND "libloongcollector_spl_2.13.2.a")
769769
if (NOT LIB_FOUND)
770770
message(FATAL_ERROR "Please upgrade your development image to compile!")
771771
endif()
772772

773-
target_link_libraries(${target_name} "libloongcollector_spl_2.11.6.a")
773+
target_link_libraries(${target_name} "libloongcollector_spl_2.13.2.a")
774774
target_link_libraries(${target_name} "libx.a")
775775
target_link_libraries(${target_name} "libxx.a")
776776
target_link_libraries(${target_name} "libsls_velox_functions.a")
@@ -793,79 +793,7 @@ macro(link_spl target_name)
793793
target_link_libraries(${target_name} "libpresto_operators.a")
794794
target_link_libraries(${target_name} "libpresto_types.a")
795795

796-
target_link_libraries(${target_name} "libvelox_tpch_connector.a")
797-
target_link_libraries(${target_name} "libvelox_hive_connector.a")
798-
target_link_libraries(${target_name} "libvelox_exec.a")
799-
800-
target_link_libraries(${target_name} "libvelox_functions_prestosql.a")
801-
target_link_libraries(${target_name} "libvelox_functions_prestosql_impl.a")
802-
target_link_libraries(${target_name} "libvelox_aggregates.a")
803-
target_link_libraries(${target_name} "libvelox_arrow_bridge.a")
804-
target_link_libraries(${target_name} "libvelox_buffer.a")
805-
target_link_libraries(${target_name} "libvelox_common_hyperloglog.a")
806-
target_link_libraries(${target_name} "libvelox_connector.a")
807-
target_link_libraries(${target_name} "libvelox_core.a")
808-
target_link_libraries(${target_name} "libvelox_flag_definitions.a")
809-
target_link_libraries(${target_name} "libvelox_coverage_util.a")
810-
target_link_libraries(${target_name} "libvelox_dwio_catalog_fbhive.a")
811-
812-
target_link_libraries(${target_name} "libvelox_dwio_dwrf_reader.a")
813-
target_link_libraries(${target_name} "libvelox_dwio_dwrf_writer.a")
814-
target_link_libraries(${target_name} "libvelox_dwio_dwrf_utils.a")
815-
target_link_libraries(${target_name} "libvelox_dwio_dwrf_common.a")
816-
target_link_libraries(${target_name} "libvelox_dwio_common.a")
817-
target_link_libraries(${target_name} "libvelox_dwio_common_compression.a")
818-
target_link_libraries(${target_name} "libvelox_dwio_common_encryption.a")
819-
target_link_libraries(${target_name} "libvelox_dwio_common_exception.a")
820-
target_link_libraries(${target_name} "libvelox_dwio_parquet_reader.a")
821-
target_link_libraries(${target_name} "libvelox_dwio_parquet_writer.a")
822-
823-
target_link_libraries(${target_name} "libvelox_encode.a")
824-
target_link_libraries(${target_name} "libvelox_exception.a")
825-
target_link_libraries(${target_name} "libvelox_presto_serializer.a")
826-
target_link_libraries(${target_name} "libvelox_caching.a")
827-
target_link_libraries(${target_name} "libvelox_expression.a")
828-
target_link_libraries(${target_name} "libvelox_expression_functions.a")
829-
target_link_libraries(${target_name} "libvelox_external_date.a")
830-
target_link_libraries(${target_name} "libvelox_external_md5.a")
831-
target_link_libraries(${target_name} "libvelox_file.a")
832-
target_link_libraries(${target_name} "libvelox_parse_expression.a")
833-
target_link_libraries(${target_name} "libvelox_function_registry.a")
834-
target_link_libraries(${target_name} "libvelox_functions_aggregates.a")
835-
target_link_libraries(${target_name} "libvelox_functions_json.a")
836-
target_link_libraries(${target_name} "libvelox_functions_lib.a")
837-
target_link_libraries(${target_name} "libvelox_functions_util.a")
838-
target_link_libraries(${target_name} "libvelox_functions_window.a")
839-
target_link_libraries(${target_name} "libvelox_functions_lib_date_time_formatter.a")
840-
target_link_libraries(${target_name} "libvelox_hive_partition_function.a")
841-
target_link_libraries(${target_name} "libvelox_is_null_functions.a")
842-
target_link_libraries(${target_name} "libvelox_memory.a")
843-
target_link_libraries(${target_name} "libvelox_status.a")
844-
845-
target_link_libraries(${target_name} "libvelox_parse_parser.a")
846-
target_link_libraries(${target_name} "libvelox_parse_utils.a")
847-
target_link_libraries(${target_name} "libvelox_process.a")
848-
target_link_libraries(${target_name} "libvelox_row_fast.a")
849-
target_link_libraries(${target_name} "libvelox_serialization.a")
850-
target_link_libraries(${target_name} "libvelox_time.a")
851-
target_link_libraries(${target_name} "libvelox_tpch_gen.a")
852-
target_link_libraries(${target_name} "libvelox_type.a")
853-
target_link_libraries(${target_name} "libvelox_type_calculation.a")
854-
target_link_libraries(${target_name} "libvelox_type_fbhive.a")
855-
target_link_libraries(${target_name} "libvelox_type_tz.a")
856-
target_link_libraries(${target_name} "libvelox_type_signature.a")
857-
target_link_libraries(${target_name} "libvelox_vector.a")
858-
target_link_libraries(${target_name} "libvelox_vector_fuzzer.a")
859-
target_link_libraries(${target_name} "libvelox_window.a")
860-
target_link_libraries(${target_name} "libvelox_common_base.a")
861-
target_link_libraries(${target_name} "libvelox_common_compression.a")
862-
target_link_libraries(${target_name} "libvelox_common_config.a")
863-
target_link_libraries(${target_name} "libvelox_common_io.a")
864-
target_link_libraries(${target_name} "libvelox_duckdb_parser.a")
865-
target_link_libraries(${target_name} "libvelox_duckdb_conversion.a")
866-
target_link_libraries(${target_name} "libvelox_signature_parser.a")
867-
868-
target_link_libraries(${target_name} "libvelox_presto_types.a")
796+
target_link_libraries(${target_name} "libvelox.a")
869797
target_link_libraries(${target_name} "libduckdb.a")
870798
target_link_libraries(${target_name} "libduckdb_utf8proc.a")
871799
target_link_libraries(${target_name} "libduckdb_fmt.a")
@@ -922,11 +850,8 @@ macro(link_spl target_name)
922850
target_link_libraries(${target_name} "libpresto_server_lib.a")
923851
target_link_libraries(${target_name} "libpresto_sls_rpc.a")
924852

925-
# log reduced
926-
target_link_libraries(${target_name} "libvelox_memory.a")
927-
target_link_libraries(${target_name} "libvelox_common_base.a")
928-
target_link_libraries(${target_name} "libvelox_core.a")
929-
target_link_libraries(${target_name} "libvelox_connector.a")
853+
# log reduced
854+
target_link_libraries(${target_name} "libvelox.a")
930855
target_link_libraries(${target_name} "libfolly.a")
931856

932857
endmacro()

docker/Dockerfile_build

Lines changed: 1 addition & 1 deletion
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.15 AS build
15+
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.16 AS build
1616

1717
USER root
1818
WORKDIR /src

docker/Dockerfile_coverage

Lines changed: 1 addition & 1 deletion
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.15
15+
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.16
1616

1717
USER root
1818
WORKDIR /src

docker/Dockerfile_development_part

Lines changed: 1 addition & 1 deletion
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.15
15+
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.16
1616

1717
ARG HOST_OS=Linux
1818
ARG VERSION=0.0.1

docker/Dockerfile_edge_linux

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#########################################################################################################################
22
# Step 1: Build
33
#########################################################################################################################
4-
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.15 AS builder
4+
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.16 AS builder
55

66
# Build arguments
77
ARG VERSION=edge

docker/Dockerfile_release

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ RUN if [ "$HOST_OS" = "Linux" ]; then \
4646
fi
4747

4848
# Provide CentOS-compiled SASL libraries for librdkafka (expects libsasl2.so.3)
49-
COPY --from=sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.15 /usr/lib64/libsasl2.so.3 /usr/lib/x86_64-linux-gnu/
50-
COPY --from=sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.15 /usr/lib64/libsasl2.so.3.0.0 /usr/lib/x86_64-linux-gnu/
51-
COPY --from=sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.15 /usr/lib64/sasl2 /usr/lib/x86_64-linux-gnu/sasl2
49+
COPY --from=sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.16 /usr/lib64/libsasl2.so.3 /usr/lib/x86_64-linux-gnu/
50+
COPY --from=sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.16 /usr/lib64/libsasl2.so.3.0.0 /usr/lib/x86_64-linux-gnu/
51+
COPY --from=sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.16 /usr/lib64/sasl2 /usr/lib/x86_64-linux-gnu/sasl2
5252

5353
WORKDIR /usr/local/loongcollector
5454
RUN mkdir -p /usr/local/loongcollector/conf/instance_config/local

docs/cn/developer-guide/development-environment.md

Lines changed: 2 additions & 2 deletions
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.15",
87+
"image": "sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.16",
8888
"customizations": {
8989
"vscode": {
9090
"extensions": [
@@ -190,7 +190,7 @@ cp -a ./core/build/go_pipeline/libGoPluginAdapter.so ./output
190190
```bash
191191
docker run --name loongcollector-build -d \
192192
-v `pwd`:/src -w /src \
193-
sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.15 \
193+
sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.16 \
194194
bash -c "sleep infinity"
195195
```
196196

0 commit comments

Comments
 (0)