revert changes

Author: kobzonega

ydb/deploy/docker/Dockerfile

@@ -1,8 +1,8 @@
 # syntax=docker/dockerfile:1.4
 ARG BASE_IMAGE="cr.yandex/mirror/ubuntu"
 ARG BASE_IMAGE_TAG="focal"
-ARG BREAKPAD_IMAGE="cr.yandex/crp2lrlsrs36odlvd8dv/breakpad_init"
-ARG BREAKPAD_IMAGE_TAG="v2022.07.12"
+ARG BREAKPAD_INIT_IMAGE="cr.yandex/crp2lrlsrs36odlvd8dv/breakpad_init"
+ARG BREAKPAD_INIT_IMAGE_TAG="v2022.07.12"
 
 ###
 # Base image with required deb packages
@@ -12,15 +12,23 @@ RUN groupadd -r ydb && useradd --no-log-init -r -m -g ydb -G disk ydb && \
     apt-get -yqq update && \
     apt-get -yqq install --no-install-recommends libcap2-bin ca-certificates && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
+# release information
+COPY --chmod=0644 /AUTHORS /AUTHORS
+COPY --chmod=0644 /LICENSE /LICENSE
+COPY --chmod=0644 /README.md /README.md
+# dynamic libraries
+COPY --chmod=0644 /libiconv.so /lib/libiconv.so
+COPY --chmod=0644 /liblibidn-dynamic.so /lib/liblibidn-dynamic.so
+COPY --chmod=0644 /liblibaio-dynamic.so /lib/liblibaio-dynamic.so
 
 ###
 # Base image with google brekpad assets
 ###
-FROM ${BREAKPAD_IMAGE}:${BREAKPAD_IMAGE_TAG} AS breakpad_init
+FROM ${BREAKPAD_INIT_IMAGE}:${BREAKPAD_INIT_IMAGE_TAG} AS breakpad_init
 FROM base AS base-breakpad
 RUN \
     apt-get -yqq update && \
-    apt-get -yqq install --no-install-recommends binutils gdb strace linux-tools-generic \
+    apt-get -yqq install --no-install-recommends binutils gdb strace linux-tools-generic && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 ENV LD_PRELOAD=libbreakpad_init.so
 ENV BREAKPAD_MINIDUMPS_PATH=/opt/ydb/volumes/coredumps
@@ -32,30 +40,6 @@ COPY --chmod=0755 --from=breakpad_init /usr/bin/minidump-2-core /usr/bin/minidum
 # minidump callback script
 COPY --chmod=0755 --chown=ydb /minidump_script.py /opt/ydb/bin/minidump_script.py
 
-###
-# Base image with debug packages
-###
-FROM base-breakpad AS base-debug
-RUN \
-    apt-get -yqq update && \
-    apt-get -yqq  --no-install-recommends dnsutils telnet netcat-openbsd iputils-ping curl && \
-    apt-get clean all && rm -rf /var/lib/apt/lists/*
-
-FROM scratch AS license
-# release information
-COPY --chmod=0644 /AUTHORS /AUTHORS
-COPY --chmod=0644 /LICENSE /LICENSE
-COPY --chmod=0644 /README.md /README.md
-
-FROM scratch AS dynamic-libs
-# dynamic libraries
-COPY --chmod=0644 /libiconv.so /lib/libiconv.so
-COPY --chmod=0644 /liblibidn-dynamic.so /lib/liblibidn-dynamic.so
-COPY --chmod=0644 /liblibaio-dynamic.so /lib/liblibaio-dynamic.so
-
-FROM base AS ydb-binary
-COPY --chmod=0755 --chown=ydb /ydb /opt/ydb/bin/ydb
-
 FROM base AS ydbd-setcap
 COPY --chmod=0755 --chown=ydb /ydbd /opt/ydb/bin/ydbd
 # workaround for decrease image size
@@ -65,57 +49,31 @@ RUN /sbin/setcap CAP_SYS_RAWIO=ep /opt/ydb/bin/ydbd
 # Release image
 ###
 FROM base AS release
-# release information
-COPY --link --from=license /AUTHORS /AUTHORS
-COPY --link --from=license /LICENSE /LICENSE
-COPY --link --from=license /README.md /README.md
-# dynamic libraries
-COPY --link --from=dynamic-libs /lib/libiconv.so /lib/libiconv.so
-COPY --link --from=dynamic-libs /lib/liblibidn-dynamic.so /lib/liblibidn-dynamic.so
-COPY --link --from=dynamic-libs /lib/liblibaio-dynamic.so /lib/liblibaio-dynamic.so
 # ydb binaries
-COPY --link --from=ydb-binary /opt/ydb/bin/ydb /opt/ydb/bin/ydb
+COPY --chmod=0755 --chown=ydb /ydb /opt/ydb/bin/ydb
 COPY --link --from=ydbd-setcap /opt/ydb/bin/ydbd /opt/ydb/bin/ydbd
-
 WORKDIR /opt/ydb/bin
 USER ydb
 
 ###
 # Breakpad Image
 ###
 FROM base-breakpad AS breakpad
-# release information
-COPY --link --from=license /AUTHORS /AUTHORS
-COPY --link --from=license /LICENSE /LICENSE
-COPY --link --from=license /README.md /README.md
-# dynamic libraries
-COPY --link --from=dynamic-libs /lib/libiconv.so /lib/libiconv.so
-COPY --link --from=dynamic-libs /lib/liblibidn-dynamic.so /lib/liblibidn-dynamic.so
-COPY --link --from=dynamic-libs /lib/liblibaio-dynamic.so /lib/liblibaio-dynamic.so
 # ydb binaries
-COPY --link --from=ydb-binary /opt/ydb/bin/ydb /opt/ydb/bin/ydb
+COPY --chmod=0755 --chown=ydb /ydb /opt/ydb/bin/ydb
 COPY --link --from=ydbd-setcap /opt/ydb/bin/ydbd /opt/ydb/bin/ydbd
-
 WORKDIR /opt/ydb/bin
 USER ydb
 
 ###
 # Debug Image
 ###
-FROM base-debug AS debug
-# release information
-COPY --link --from=license /AUTHORS /AUTHORS
-COPY --link --from=license /LICENSE /LICENSE
-COPY --link --from=license /README.md /README.md
-# dynamic libraries
-COPY --link --from=dynamic-libs /lib/libiconv.so /lib/libiconv.so
-COPY --link --from=dynamic-libs /lib/liblibidn-dynamic.so /lib/liblibidn-dynamic.so
-COPY --link --from=dynamic-libs /lib/liblibaio-dynamic.so /lib/liblibaio-dynamic.so
-# ydb binaries
-COPY --link --from=ydb-binary /opt/ydb/bin/ydb /opt/ydb/bin/ydb
-COPY --link --from=ydbd-setcap /opt/ydb/bin/ydbd /opt/ydb/bin/ydbd
+FROM breakpad AS debug
+USER root
+RUN \
+    apt-get -yqq update && \
+    apt-get -yqq install --no-install-recommends dnsutils telnet netcat-openbsd iputils-ping curl && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
 # debug symbols
 COPY --chmod=0644 --chown=ydb /ydbd.debug /opt/ydb/bin/ydbd.debug
-
-WORKDIR /opt/ydb/bin
 USER ydb

ydb/deploy/docker/README.md

@@ -2,55 +2,58 @@
 
 ## Base image
 
-Base layer is official `ubuntu:20.04` docker image with packages:
+Base image is official `ubuntu:focal` with installed packages:
 - libcap2-bin (for setcap to binaries)
 - ca-certificates (for working with CA bundle)
 
+Also base image included `LICENSE`, `AUTHORS` and `README.md` files from root of repository
+and dynamic cpp libraries `libiconv`, `liblibidn` and `libaio`.
+
+### Base breakpad image
+
+Extend base image with:
+- additional packages to collect and manage minidump format (binutils, gdb, strace, linux-tools-generic)
+- dynamic library `libbreakpad_init.so` from breakpad_init image (ydb/deploy/breakpad_init)
+- environment variable `LD_PRELOAD` for loading breakpad library on process start
+- environment variables `BREAKPAD_MINIDUMPS_PATH` and `BREAKPAD_MINIDUMPS_SCRIPT` to setup breakpad
+- binaries `minidump_stackwalk` and `minidump-2-core` to collect stacktrace and convert in coredump format
+- python script `minidump_script.py` as dumpCallback handler for breakpad
+
 ## Image Types
 
 ### Release
 
+Image with minimal requirements to launch ydbd in container
+
 ```bash
 ya package --docker ydb/deploy/docker/pkg.json
 ```
 
-Image with minimal requirements to launch ydbd in container.
-
-The image includes:
-- dynamic cpp libraries (libiconv, libidn, libaio)
+Used base image and included:
 - ydb cli binary
 - ydbd server strip'ed binary
 
-
 ### Breakpad
 
+Image with google breakpad assets to collect minidump
+
 ```bash
 ya package --docker ydb/deploy/docker/breakpad/pkg.json
 ```
 
-Image with google breakpad assets to collect minidump instead of coredump.
+Used base image and included:
 
-Extend release image with:
-- additional packages to collect and manage minidump format
-- dynamic library `libbreakpad_init.so` from breakpad_init image (ydb/deploy/breakpad_init)
-- environment variable `LD_PRELOAD` to load library on process start
-- binaries `minidump_stackwalk` and `minidump-2-core` to collect stacktrace and convert to coredump format
-- python script `minidump_script.py` as dumpCallback handler for google breakpad
-- environment variables `BREAKPAD_MINIDUMPS_PATH` and `BREAKPAD_MINIDUMPS_SCRIPT` to setup breakpad
+- ydb cli binary
+- ydbd server strip'ed binary
 
 ### Debug
 
+Image with debug symbols and utils for dev purposes
+
 ```bash
 ya package --docker ydb/deploy/docker/debug/pkg.json
 ```
 
-Image with google breakpad assets to collect minidump instead of coredump.
-
 Extend breakpad image with:
 - additional packages with debug utils (dnsutils, telnet, netcat-openbsd, iputils-ping, curl)
 - debug symbols for ydbd binary
-
-## Additional Info
-
-All types of images also included LICENSE and AUTHORS files from root of repository
-

ydb/deploy/docker/debug/pkg.json

@@ -3,7 +3,7 @@
     "name": "ydb",
     "maintainer": "ydb <ydb@yandex-team.ru>",
     "description": "Package with opensource YDB for Kubernetes with debug symbols",
-    "version": "dbg-{branch}.{revision}"
+    "version": "debug-{branch}.{revision}"
   },
   "params": {
     "docker_build_network": "host",
@@ -12,7 +12,7 @@
     "docker_target": "debug"
   },
   "include": [
-    "ydb/deploy/docker/minidump/pkg.json"
+    "ydb/deploy/docker/breakpad/pkg.json"
   ],
   "data": []
 }

ydb/tools/ydbd_slice/image/Dockerfile

@@ -0,0 +1,28 @@
+# syntax=docker/dockerfile:1
+FROM cr.yandex/mirror/ubuntu:focal as base
+
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+  apt-get -yqq update && \
+  apt-get -yqq install libcap2-bin dnsutils telnet netcat-openbsd iputils-ping gdb atop strace curl linux-tools-generic && \
+  apt-get -yqq clean all && \
+  rm -rf /var/lib/apt/lists/* && \
+  groupadd -r ydb && \
+  useradd --no-log-init -r -m -g ydb -G disk ydb
+
+FROM base as ydbd-setcap
+
+COPY --link ydbd /ydbd
+RUN /sbin/setcap CAP_SYS_RAWIO=ep /ydbd
+
+FROM base
+
+ARG ARC_COMMIT_ID
+LABEL arc_commit_id=$ARC_COMMIT_ID
+
+WORKDIR /opt/ydb/bin
+COPY --chmod=0755 --chown=ydb:ydb --link ydb /opt/ydb/bin/ydb
+COPY --chmod=0644 --link libiconv.so /lib/libiconv.so
+COPY --chmod=0644 --link liblibidn-dynamic.so /lib/liblibidn-dynamic.so
+COPY --chmod=0644 --link liblibaio-dynamic.so /lib/liblibaio-dynamic.so
+COPY --chmod=0755 --chown=ydb:ydb --link --from=ydbd-setcap /ydbd /opt/ydb/bin/ydbd
+USER ydb

ydb/tools/ydbd_slice/image/pkg.json

@@ -0,0 +1,112 @@
+{
+  "meta": {
+    "name": "ydb",
+    "maintainer": "ydb <ydb@yandex-team.ru>",
+    "description": "Package with opensource YDB for Kubernetes",
+    "version": "{sandbox_task_id}.{branch}"
+  },
+  "build": {
+    "flags": [
+        {
+            "name": "OPENSOURCE",
+            "value": "yes"
+        },
+        {
+            "name": "HARDENING",
+            "value": "yes"
+        }
+    ],
+    "targets": [
+      "ydb/apps/ydbd",
+      "ydb/apps/ydb",
+      "contrib/libs/libiconv/dynamic",
+      "contrib/libs/libidn/dynamic",
+      "contrib/libs/libaio/dynamic"
+    ],
+
+    "target-platforms": [
+        "default-linux-x86_64"
+    ]
+  },
+  "data": [
+    {
+      "source": {
+        "type": "RELATIVE",
+        "path": "Dockerfile"
+      },
+      "destination": {
+        "path": "/Dockerfile"
+      }
+    },
+    {
+      "source": {
+        "type": "BUILD_OUTPUT",
+        "path": "contrib/libs/libiconv/dynamic/libiconv.so"
+      },
+      "destination": {
+        "path": "/libiconv.so",
+        "attributes": {
+          "mode": {
+            "value": "+x"
+          }
+        }
+      }
+    },
+    {
+      "source": {
+        "type": "BUILD_OUTPUT",
+        "path": "contrib/libs/libidn/dynamic/liblibidn-dynamic.so"
+      },
+      "destination": {
+        "path": "/liblibidn-dynamic.so",
+        "attributes": {
+          "mode": {
+            "value": "+x"
+          }
+        }
+      }
+    },
+    {
+      "source": {
+        "type": "BUILD_OUTPUT",
+        "path": "contrib/libs/libaio/dynamic/liblibaio-dynamic.so"
+      },
+      "destination": {
+        "path": "/liblibaio-dynamic.so",
+        "attributes": {
+          "mode": {
+            "value": "+x"
+          }
+        }
+      }
+    },
+    {
+      "source": {
+        "type": "BUILD_OUTPUT",
+        "path": "ydb/apps/ydbd/ydbd"
+      },
+      "destination": {
+        "path": "/ydbd",
+        "attributes": {
+          "mode": {
+            "value": "+x"
+          }
+        }
+      }
+    },
+    {
+      "source": {
+          "type": "BUILD_OUTPUT",
+          "path": "ydb/apps/ydb/ydb"
+      },
+      "destination": {
+        "path": "/ydb",
+        "attributes": {
+          "mode": {
+            "value": "+x"
+          }
+        }
+      }
+    }
+  ]
+}