Move gdb into cctools

Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>

docker/images.json

@@ -7,10 +7,6 @@
         "name": "clickhouse/cctools",
         "dependent": []
     },
-    "docker/packager/gdb": {
-        "name": "clickhouse/gdb",
-        "dependent": []
-    },
     "docker/test/compatibility/centos": {
         "name": "clickhouse/test-old-centos",
         "dependent": []

docker/packager/cctools/Dockerfile

@@ -32,5 +32,29 @@ RUN git clone https://github.com/tpoechtrager/cctools-port.git \
     && cd ../.. \
     && rm -rf cctools-port
 
+#
+# GDB
+#
+# ld from binutils is 2.38, which has the following error:
+#
+#     DWARF error: invalid or unhandled FORM value: 0x23
+#
+ENV LD=ld.lld-${LLVM_VERSION}
+ARG GDB_VERSION=15.1
+RUN apt-get update \
+    && apt-get install --yes \
+        libgmp-dev \
+        libmpfr-dev \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
+RUN wget https://sourceware.org/pub/gdb/releases/gdb-$GDB_VERSION.tar.gz \
+    && tar -xvf gdb-$GDB_VERSION.tar.gz \
+    && cd gdb-$GDB_VERSION \
+    && ./configure --prefix=/opt/gdb \
+    && make -j $(nproc) \
+    && make install \
+    && rm -fr gdb-$GDB_VERSION gdb-$GDB_VERSION.tar.gz
+
 FROM scratch
 COPY --from=builder /cctools /cctools
+COPY --from=builder /opt/gdb /opt/gdb

docker/packager/gdb/Dockerfile

@@ -1,30 +0,0 @@
-# docker build -t clickhouse/gdb .
-
-ARG FROM_TAG=latest
-FROM clickhouse/fasttest:$FROM_TAG
-
-ENV CC=clang-${LLVM_VERSION}
-ENV CXX=clang++-${LLVM_VERSION}
-# ld from binutils is 2.38, which has the following error:
-#
-#     DWARF error: invalid or unhandled FORM value: 0x23
-#
-ENV LD=ld.lld-${LLVM_VERSION}
-
-ARG GDB_VERSION=15.1
-
-# gdb dependencies
-RUN apt-get update \
-    && apt-get install --yes \
-        libgmp-dev \
-        libmpfr-dev \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
-
-RUN wget https://sourceware.org/pub/gdb/releases/gdb-$GDB_VERSION.tar.gz \
-    && tar -xvf gdb-$GDB_VERSION.tar.gz \
-    && cd gdb-$GDB_VERSION \
-    && ./configure --prefix=/usr \
-    && make -j $(nproc) \
-    && make install \
-    && rm -fr gdb-$GDB_VERSION gdb-$GDB_VERSION.tar.gz