From f83a231a6351ca41d1697b26c0dc054d83d97f5b Mon Sep 17 00:00:00 2001 From: Evgeniy Frolov Date: Thu, 7 Nov 2024 18:30:16 +0300 Subject: [PATCH] docs(refactor): add code format to long commands Signed-off-by: Evgeniy Frolov --- .../en/configurator/partials/ci/buildah_install.md.liquid | 6 +++++- .../partials/ci/gitlab_docker_main_section.md.liquid | 6 +++++- .../partials/ci/gitlab_kubernetes_main_section.md.liquid | 6 +++++- .../simple/docker-runner/linux/buildah/infra.md.liquid | 6 +++++- .../simple/kubernetes-runner/linux/buildah/infra.md.liquid | 6 +++++- .../simple/docker-runner/linux/buildah/infra.md.liquid | 6 +++++- .../simple/kubernetes-runner/linux/buildah/infra.md.liquid | 6 +++++- .../ru/configurator/partials/ci/buildah_install.md.liquid | 6 +++++- .../partials/ci/gitlab_docker_main_section.md.liquid | 2 +- .../partials/ci/gitlab_kubernetes_main_section.md.liquid | 6 +++++- .../simple/docker-runner/linux/buildah/infra.md.liquid | 6 +++++- .../simple/kubernetes-runner/linux/buildah/infra.md.liquid | 6 +++++- .../simple/docker-runner/linux/buildah/infra.md.liquid | 6 +++++- .../simple/kubernetes-runner/linux/buildah/infra.md.liquid | 6 +++++- 14 files changed, 66 insertions(+), 14 deletions(-) diff --git a/bin/configurator/static/_includes/en/configurator/partials/ci/buildah_install.md.liquid b/bin/configurator/static/_includes/en/configurator/partials/ci/buildah_install.md.liquid index 5214bb7af..36549f94a 100644 --- a/bin/configurator/static/_includes/en/configurator/partials/ci/buildah_install.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/partials/ci/buildah_install.md.liquid @@ -38,4 +38,8 @@ Follow these steps on the GitLab Runner host to install Buildah: * The `sysctl -n user.max_user_namespaces` command should return `15000` or more, otherwise run `echo 'user.max_user_namespaces = 15000' | sudo tee -a /etc/sysctl.conf && sudo sysctl -p`. -* (For Ubuntu 23.10 and later) set values `kernel.apparmor_restrict_unprivileged_unconfined` and `kernel.apparmor_restrict_unprivileged_userns` to `0` with the command `{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf` \ No newline at end of file +* (For Ubuntu 23.10 and later) set values `kernel.apparmor_restrict_unprivileged_unconfined` and `kernel.apparmor_restrict_unprivileged_userns` to `0` with the command: + +```shell +{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf +``` \ No newline at end of file diff --git a/bin/configurator/static/_includes/en/configurator/partials/ci/gitlab_docker_main_section.md.liquid b/bin/configurator/static/_includes/en/configurator/partials/ci/gitlab_docker_main_section.md.liquid index a3fd69344..f7654c846 100644 --- a/bin/configurator/static/_includes/en/configurator/partials/ci/gitlab_docker_main_section.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/partials/ci/gitlab_docker_main_section.md.liquid @@ -8,7 +8,11 @@ ### Prepare the environment -(For Ubuntu 23.10 and later) on the GitLab Runner host the `sysctl -ne kernel.apparmor_restrict_unprivileged_userns` command should not return 1, otherwise run `echo "kernel.apparmor_restrict_unprivileged_userns = 0" | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf` +(For Ubuntu 23.10 and later) on the GitLab Runner host run: + +```shell +{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf +``` ### Installing GitLab Runner diff --git a/bin/configurator/static/_includes/en/configurator/partials/ci/gitlab_kubernetes_main_section.md.liquid b/bin/configurator/static/_includes/en/configurator/partials/ci/gitlab_kubernetes_main_section.md.liquid index 2f8b9fc57..3d582dc42 100644 --- a/bin/configurator/static/_includes/en/configurator/partials/ci/gitlab_kubernetes_main_section.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/partials/ci/gitlab_kubernetes_main_section.md.liquid @@ -10,7 +10,11 @@ Follow [official instructions](https://docs.gitlab.com/runner/install/) to insta ### Prepare the environment -(For Ubuntu 23.10 and later) on the GitLab Runner nodes run `{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf` +(For Ubuntu 23.10 and later) on the GitLab Runner nodes run: + +```shell +{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf +``` ### Basic GitLab Runner configuration (no caching) diff --git a/bin/configurator/static/_includes/en/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/docker-runner/linux/buildah/infra.md.liquid b/bin/configurator/static/_includes/en/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/docker-runner/linux/buildah/infra.md.liquid index 1f7dc9e37..78a09e2ab 100644 --- a/bin/configurator/static/_includes/en/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/docker-runner/linux/buildah/infra.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/docker-runner/linux/buildah/infra.md.liquid @@ -10,7 +10,11 @@ ### Prepare the environment -(For Ubuntu 23.10 and later) on the GitLab Runner host run `{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf` +(For Ubuntu 23.10 and later) on the GitLab Runner host run: + +```shell +{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf +``` ### Installing GitLab Runner diff --git a/bin/configurator/static/_includes/en/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/kubernetes-runner/linux/buildah/infra.md.liquid b/bin/configurator/static/_includes/en/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/kubernetes-runner/linux/buildah/infra.md.liquid index 5fc1617b4..2dfbc2c9e 100644 --- a/bin/configurator/static/_includes/en/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/kubernetes-runner/linux/buildah/infra.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/kubernetes-runner/linux/buildah/infra.md.liquid @@ -8,7 +8,11 @@ ### Prepare the environment -(For Ubuntu 23.10 and later) on the GitLab Runner nodes run `{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf` +(For Ubuntu 23.10 and later) on the GitLab Runner nodes run: + +```shell +{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf +``` ### Install GitLab Runner diff --git a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/infra.md.liquid b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/infra.md.liquid index 243b19764..d0b61500d 100644 --- a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/infra.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/infra.md.liquid @@ -10,7 +10,11 @@ ### Prepare the environment -(For Ubuntu 23.10 and later) on the GitLab Runner host run `{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf` +(For Ubuntu 23.10 and later) on the GitLab Runner host run: + +```shell +{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf +``` ### Configuring the Runner diff --git a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/infra.md.liquid b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/infra.md.liquid index a94dfc045..3e28e973b 100644 --- a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/infra.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/infra.md.liquid @@ -6,7 +6,11 @@ ### Prepare the environment -(For Ubuntu 23.10 and later) on the GitLab Runner nodes run `{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf` +(For Ubuntu 23.10 and later) on the GitLab Runner nodes run: + +```shell +{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf +``` ### Basic Runner configuration (no caching) diff --git a/bin/configurator/static/_includes/ru/configurator/partials/ci/buildah_install.md.liquid b/bin/configurator/static/_includes/ru/configurator/partials/ci/buildah_install.md.liquid index 1c5a7ac29..c6acdb1c5 100644 --- a/bin/configurator/static/_includes/ru/configurator/partials/ci/buildah_install.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/partials/ci/buildah_install.md.liquid @@ -38,4 +38,8 @@ * Команда `sysctl -n user.max_user_namespaces` должна вернуть `15000` или больше, а иначе выполните `echo 'user.max_user_namespaces = 15000' | sudo tee -a /etc/sysctl.conf && sudo sysctl -p`. -* (Для Ubuntu 23.10 и выше) установите значения `kernel.apparmor_restrict_unprivileged_unconfined` и `kernel.apparmor_restrict_unprivileged_userns` в `0` командой `{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf` \ No newline at end of file +* (Для Ubuntu 23.10 и выше) установите значения `kernel.apparmor_restrict_unprivileged_unconfined` и `kernel.apparmor_restrict_unprivileged_userns` в `0` командой: + +```shell +{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf +``` \ No newline at end of file diff --git a/bin/configurator/static/_includes/ru/configurator/partials/ci/gitlab_docker_main_section.md.liquid b/bin/configurator/static/_includes/ru/configurator/partials/ci/gitlab_docker_main_section.md.liquid index c06be82a1..ca5f855c2 100644 --- a/bin/configurator/static/_includes/ru/configurator/partials/ci/gitlab_docker_main_section.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/partials/ci/gitlab_docker_main_section.md.liquid @@ -8,7 +8,7 @@ ### Подготовка окружения -(Для Ubuntu 23.10 и выше) на хосте GitLab Runner команда `sysctl -ne kernel.apparmor_restrict_unprivileged_userns` не должна возвращать 1, в противном случае запустите `echo "kernel.apparmor_restrict_unprivileged_userns = 0" | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf` +(Для Ubuntu 23.10 и выше) на хосте GitLab Runner запустите `{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf` ### Установка GitLab Runner diff --git a/bin/configurator/static/_includes/ru/configurator/partials/ci/gitlab_kubernetes_main_section.md.liquid b/bin/configurator/static/_includes/ru/configurator/partials/ci/gitlab_kubernetes_main_section.md.liquid index a1e92fade..36cf093e7 100644 --- a/bin/configurator/static/_includes/ru/configurator/partials/ci/gitlab_kubernetes_main_section.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/partials/ci/gitlab_kubernetes_main_section.md.liquid @@ -6,7 +6,11 @@ ### Подготовка окружения -(Для Ubuntu 23.10 и выше) на нодах GitLab Runner запустите `{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf` +(Для Ubuntu 23.10 и выше) на нодах GitLab Runner запустите: + +```shell +{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf +``` ### Установка GitLab Runner diff --git a/bin/configurator/static/_includes/ru/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/docker-runner/linux/buildah/infra.md.liquid b/bin/configurator/static/_includes/ru/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/docker-runner/linux/buildah/infra.md.liquid index 2d71898c2..ef3ede8d7 100644 --- a/bin/configurator/static/_includes/ru/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/docker-runner/linux/buildah/infra.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/docker-runner/linux/buildah/infra.md.liquid @@ -10,7 +10,11 @@ ### Подготовка окружения -(Для Ubuntu 23.10 и выше) на хосте GitLab Runner запустите `{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf` +(Для Ubuntu 23.10 и выше) на хосте GitLab Runner запустите: + +```shell +{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf +``` ### Установка GitLab Runner diff --git a/bin/configurator/static/_includes/ru/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/kubernetes-runner/linux/buildah/infra.md.liquid b/bin/configurator/static/_includes/ru/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/kubernetes-runner/linux/buildah/infra.md.liquid index cf1679622..f05cb42ae 100644 --- a/bin/configurator/static/_includes/ru/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/kubernetes-runner/linux/buildah/infra.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/kubernetes-runner/linux/buildah/infra.md.liquid @@ -8,7 +8,11 @@ ### Подготовка окружения -(Для Ubuntu 23.10 и выше) на нодах GitLab Runner запустите `{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf` +(Для Ubuntu 23.10 и выше) на нодах GitLab Runner запустите: + +```shell +{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf +``` ### Установка GitLab Runner diff --git a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/infra.md.liquid b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/infra.md.liquid index 03a706575..5eefbcd45 100644 --- a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/infra.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/infra.md.liquid @@ -10,7 +10,11 @@ ### Подготовка окружения -(Для Ubuntu 23.10 и выше) на хосте GitLab Runner запустите `{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf` +(Для Ubuntu 23.10 и выше) на хосте GitLab Runner запустите: + +```shell +{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf +``` ### Настройка Runner'а diff --git a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/infra.md.liquid b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/infra.md.liquid index 1f2f7eddd..a1ec7b002 100644 --- a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/infra.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/infra.md.liquid @@ -6,7 +6,11 @@ ### Подготовка окружения -(Для Ubuntu 23.10 и выше) на хосте GitLab Runner запустите `{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf` +(Для Ubuntu 23.10 и выше) на хосте GitLab Runner запустите: + +```shell +{ echo "kernel.apparmor_restrict_unprivileged_userns = 0" && echo "kernel.apparmor_restrict_unprivileged_unconfined = 0";} | sudo tee -a /etc/sysctl.d/20-apparmor-donotrestrict.conf && sudo sysctl -p /etc/sysctl.d/20-apparmor-donotrestrict.conf +``` ### Базовая настройка Runner (без кэширования)