Skip to content

Commit f7fed0f

Browse files
authored
Merge pull request #958 from Altinity/patch_dockerfiles_25.6
Antalya 25.6 Patch dockerfiles
2 parents 00cabd3 + 4e38845 commit f7fed0f

File tree

10 files changed

+16
-16
lines changed

10 files changed

+16
-16
lines changed

ci/docker/binary-builder/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# docker build -t clickhouse/binary-builder .
1+
# docker build -t altinityinfra/binary-builder .
22
ARG FROM_TAG
3-
FROM clickhouse/fasttest:$FROM_TAG
3+
FROM altinityinfra/fasttest:$FROM_TAG
44
ENV CC=clang-${LLVM_VERSION}
55
ENV CXX=clang++-${LLVM_VERSION}
66

77
# If the cctools is updated, then first build it in the CI, then update here in a different commit
8-
COPY --from=clickhouse/cctools:425d6927d1efbd790bdb /cctools /cctools
8+
COPY --from=altinityinfra/cctools:be2e8df7c90d7a48e6ef /cctools /cctools
99

1010
# We need OpenSSL FIPS in permissive mode for build on MasterCI
11-
COPY --from=clickhouse/cctools:425d6927d1efbd790bdb \
11+
COPY --from=altinityinfra/cctools:be2e8df7c90d7a48e6ef \
1212
/opt/openssl-fips/openssl.cnf \
1313
/opt/openssl-fips/fipsmodule.cnf \
1414
/opt/openssl-fips/fips.so \

ci/docker/cctools/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# docker build -t clickhouse/cctools .
1+
# docker build -t altinityinfra/cctools .
22

33
# This is a hack to significantly reduce the build time of the clickhouse/binary-builder
44
# It's based on the assumption that we don't care of the cctools version so much
55
# It even does not depend on the clickhouse/fasttest in the `docker/images.json`
66
ARG FROM_TAG=latest
7-
FROM clickhouse/fasttest:$FROM_TAG AS builder
7+
FROM altinityinfra/fasttest:$FROM_TAG AS builder
88

99
ENV CC=clang-${LLVM_VERSION}
1010
ENV CXX=clang++-${LLVM_VERSION}

ci/docker/compatibility/centos/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t clickhouse/test-old-centos .
1+
# docker build -t altinityinfra/test-old-centos .
22
FROM centos:5
33

44
CMD /bin/sh -c "/clickhouse server --config /config/config.xml > /var/log/clickhouse-server/stderr.log 2>&1 & \

ci/docker/compatibility/ubuntu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t clickhouse/test-old-ubuntu .
1+
# docker build -t altinityinfra/test-old-ubuntu .
22
FROM ubuntu:12.04
33

44
CMD /bin/sh -c "/clickhouse server --config /config/config.xml > /var/log/clickhouse-server/stderr.log 2>&1 & \

ci/docker/docs-builder/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t clickhouse/docs-builder .
1+
# docker build -t altinityinfra/docs-builder .
22
FROM node:20-bookworm-slim
33

44
RUN apt-get update && \

ci/docker/fasttest/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t clickhouse/fasttest .
1+
# docker build -t altinityinfra/fasttest .
22
FROM ubuntu:22.04
33

44
# ARG for quick switch to a given ubuntu mirror
@@ -71,7 +71,7 @@ RUN apt-get update \
7171
&& apt-get clean \
7272
&& rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
7373

74-
COPY --from=clickhouse/cctools:425d6927d1efbd790bdb /opt/gdb /opt/gdb
74+
COPY --from=altinityinfra/cctools:be2e8df7c90d7a48e6ef /opt/gdb /opt/gdb
7575
# Give suid to gdb to grant it attach permissions
7676
RUN chmod u+s /opt/gdb/bin/gdb
7777
ENV PATH="/opt/gdb/bin:${PATH}"

ci/docker/integration/integration-test/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t clickhouse/integration-test .
1+
# docker build -t altinityinfra/integration-test .
22
FROM ubuntu:22.04
33

44
# ARG for quick switch to a given ubuntu mirror

ci/docker/sqlancer-test/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t clickhouse/sqlancer-test .
1+
# docker build -t altinityinfra/sqlancer-test .
22
FROM ubuntu:22.04
33

44
# ARG for quick switch to a given ubuntu mirror

ci/docker/stateless-test/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t clickhouse/stateless-test .
1+
# docker build -t altinityinfra/stateless-test .
22
FROM ubuntu:22.04
33

44
# ARG for quick switch to a given ubuntu mirror
@@ -175,5 +175,5 @@ ENV PYTHONPATH=".:./ci"
175175
# A directory for cache
176176
RUN mkdir /dev/shm/clickhouse
177177

178-
COPY --from=clickhouse/cctools:4670e95dde3de689f103 /opt/gdb /opt/gdb
178+
COPY --from=altinityinfra/cctools:be2e8df7c90d7a48e6ef /opt/gdb /opt/gdb
179179
ENV PATH="/opt/gdb/bin:${PATH}"

ci/docker/style-test/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker build -t clickhouse/style-test .
1+
# docker build -t altinityinfra/style-test .
22
FROM ubuntu:22.04
33

44
RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install --yes \

0 commit comments

Comments
 (0)