Skip to content

Commit

Permalink
fix: rm spdlog replace implementation && support to build image in ar…
Browse files Browse the repository at this point in the history
…m && fix file location error (alibaba#1927)
  • Loading branch information
linrunqi08 authored Nov 27, 2024
1 parent 8551208 commit 8479976
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 162 deletions.
9 changes: 0 additions & 9 deletions core/dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,6 @@ foreach (DEP_NAME ${DEP_NAME_LIST})
endif ()
endforeach (DEP_NAME)

# spdlog, replace implementation.
if (spdlog_${INCLUDE_DIR_SUFFIX})
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/deps/spdlog/sinks/rotating_file_sink-inl.h
DESTINATION "${spdlog_${INCLUDE_DIR_SUFFIX}}/spdlog/sinks")
else ()
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/deps/spdlog/sinks/rotating_file_sink-inl.h
DESTINATION ${DEPS_INCLUDE_ROOT}/spdlog/sinks)
endif ()

# gtest
macro(link_gtest target_name)
if (gtest_${LINK_OPTION_SUFFIX})
Expand Down
151 changes: 0 additions & 151 deletions core/deps/spdlog/sinks/rotating_file_sink-inl.h

This file was deleted.

15 changes: 14 additions & 1 deletion docker/Dockerfile_production
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,20 @@ MAINTAINER TomYu [email protected]

ENV container docker

RUN curl -L -o /etc/yum.repos.d/CentOS-Base.repo http://mirrors.aliyun.com/repo/Centos-7.repo

ARG TARGETPLATFORM

RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
echo "Building for AMD64"; \
curl -L -o /etc/yum.repos.d/CentOS-Base.repo http://mirrors.aliyun.com/repo/Centos-7.repo; \
elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
echo "Building for ARM64"; \
curl -L -o /etc/yum.repos.d/CentOS-Base.repo http://mirrors.aliyun.com/repo/Centos-altarch-7.repo; \
else \
echo "Unsupported platform: $TARGETPLATFORM"; \
exit 1; \
fi


RUN yum update -y && yum upgrade -y && yum -y clean all && rm -fr /var/cache && rm -rf /core.*

Expand Down
2 changes: 1 addition & 1 deletion scripts/update_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ sed -i "s/VERSION=\${3:-.*}/VERSION=\${3:-$version}/g" scripts/*.sh
sed -i "s/VERSION=\${4:-.*}/VERSION=\${4:-$version}/g" scripts/*.sh
sed -i "s/DIST_DIR=\${2:-loongcollector-.*}/DIST_DIR=\${2:-loongcollector-$version}/g" scripts/dist.sh
sed -i "s/^set ILOGTAIL_VERSION=.*/set ILOGTAIL_VERSION=$version/g" scripts/*.bat
sed -i "s/image: aliyun\\/loongcollector:.*/image: aliyun\\/loongcollector:$version/g" test/engine/boot/compose.go
sed -i "s/image: aliyun\\/loongcollector:.*/image: aliyun\\/loongcollector:$version/g" test/engine/setup/dockercompose/compose.go

# Docs
sed -i "s/aliyun\\/loongcollector:[^\` ]*/aliyun\\/loongcollector:$version/g" \
Expand Down

0 comments on commit 8479976

Please sign in to comment.