Skip to content

fix: update base image to resolve 'Illegal instruction' error on old CPUs #1429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:2.0
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:2.0.1

ARG USERNAME=admin
USER root
Expand Down
2 changes: 1 addition & 1 deletion config_server/service/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:spl-0.1 as build
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:2.0.1 as build

USER root
WORKDIR /src
Expand Down
16 changes: 12 additions & 4 deletions docker/Dockerfile.ilogtail-build-linux
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,24 @@ ARG TARGETPLATFORM
RUN curl -sSfL https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/toolchain/goc-v1.4.1-linux-${TARGETPLATFORM##*/}.tar.gz -o goc-v1.4.1-linux-${TARGETPLATFORM##*/}.tar.gz && \
tar -xzf goc-v1.4.1-linux-${TARGETPLATFORM##*/}.tar.gz

RUN curl -sSfL https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/prebuilt-dependencies/ilogtail-deps.linux-${TARGETPLATFORM##*/}-gcc_9.3.1-1.tar.gz -o ilogtail-deps.linux-${TARGETPLATFORM##*/}.tar.gz && \
tar -xzf ilogtail-deps.linux-${TARGETPLATFORM##*/}.tar.gz && \
mv ilogtail-deps.linux-${TARGETPLATFORM##*/} ilogtail-deps
RUN curl -sSfL https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/prebuilt-dependencies/ilogtail-deps.linux-${TARGETPLATFORM##*/}-2.0.1.tar.gz -o ilogtail-deps.linux-${TARGETPLATFORM##*/}.tar.gz && \
mkdir ilogtail-deps &&\
tar -xzvf ilogtail-deps.linux-${TARGETPLATFORM##*/}.tar.gz -C ilogtail-deps --strip-components 1

RUN curl -sSfL https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/logtail-spl-dependencies/logtail-spl-${TARGETPLATFORM##*/}-2.0.1.tar.gz -o ilogtail-spl.linux-${TARGETPLATFORM##*/}.tar.gz && \
mkdir ilogtail-spl &&\
tar -xzvf ilogtail-spl.linux-${TARGETPLATFORM##*/}.tar.gz -C ilogtail-spl --strip-components 1

FROM --platform=$TARGETPLATFORM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-toolchain-linux:gcc_9.3.1-1
RUN mkdir -p /usr/local/bin /opt/logtail
RUN mkdir -p /usr/local/bin /opt/logtail /opt/logtail_spl

# install goc for coverage
COPY --from=dep-build goc /usr/local/bin
# install c++ deps
COPY --from=dep-build ilogtail-deps /opt/logtail/deps
# install spl deps
COPY --from=dep-build ilogtail-spl /opt/logtail_spl


ARG USERNAME=admin
ARG USER_UID=500
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile_build
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:spl-0.1 as build
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:2.0.1 as build

WORKDIR /src

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile_development_part
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:spl-0.1
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:2.0.1

ARG HOST_OS=Linux
ARG VERSION=2.0.0
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile_goc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

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

FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:spl-0.1 as build
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:2.0.1 as build

USER root
ENTRYPOINT ["goc","server"]
Loading