diff --git a/bin/configurator/static/_includes/en/configurator/partials/ci/buildah_ubuntu.md.liquid b/bin/configurator/static/_includes/en/configurator/partials/ci/buildah_ubuntu.md.liquid new file mode 100644 index 000000000..32c016b71 --- /dev/null +++ b/bin/configurator/static/_includes/en/configurator/partials/ci/buildah_ubuntu.md.liquid @@ -0,0 +1,7 @@ +### Setting up the build environment with Buildah + +(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 +``` \ 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 f7654c846..36df31ed4 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 @@ -6,13 +6,7 @@ - [Docker Engine](https://docs.docker.com/engine/install/). -### Prepare the environment - -(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 -``` +{% include configurator/partials/ci/buildah_ubuntu.md.liquid %} ### 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 3d582dc42..9f976d477 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 @@ -8,13 +8,7 @@ Follow [official instructions](https://docs.gitlab.com/runner/install/) to install and register the GitLab Runner. If you are going to install your GitLab Runner in Kubernetes, then install it to `gitlab-ci` namespace. -### Prepare the environment - -(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 -``` +{% include configurator/partials/ci/buildah_ubuntu.md.liquid %} ### 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 78a09e2ab..844cac5d5 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 @@ -8,13 +8,7 @@ - [Argo CD](https://argo-cd.readthedocs.io/en/stable/getting_started/#1-install-argo-cd). -### Prepare the environment - -(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 -``` +{% include configurator/partials/ci/buildah_ubuntu.md.liquid %} ### 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 2dfbc2c9e..2e867c908 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 @@ -6,13 +6,7 @@ - [Argo CD](https://argo-cd.readthedocs.io/en/stable/getting_started/#1-install-argo-cd). -### Prepare the environment - -(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 -``` +{% include configurator/partials/ci/buildah_ubuntu.md.liquid %} ### Install GitLab Runner diff --git a/bin/configurator/static/_includes/en/configurator/tab/ci/github-actions/simple/docker-runner/linux/buildah/infra.md.liquid b/bin/configurator/static/_includes/en/configurator/tab/ci/github-actions/simple/docker-runner/linux/buildah/infra.md.liquid index 77473f515..e0852881e 100644 --- a/bin/configurator/static/_includes/en/configurator/tab/ci/github-actions/simple/docker-runner/linux/buildah/infra.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/tab/ci/github-actions/simple/docker-runner/linux/buildah/infra.md.liquid @@ -12,10 +12,4 @@ Install and register GitHub Runner on its dedicated host by following the [official instructions](https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners/adding-self-hosted-runners). -### Setting up the build environment with Buildah - -(For Ubuntu 23.10 and later) on the GitHub 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 -``` \ No newline at end of file +{% include configurator/partials/ci/buildah_ubuntu.md.liquid %} 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 d0b61500d..5831ea4f7 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 @@ -8,13 +8,7 @@ * [Docker Engine](https://docs.docker.com/engine/install/). -### Prepare the environment - -(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 -``` +{% include configurator/partials/ci/buildah_ubuntu.md.liquid %} ### 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 3e28e973b..a68dc46ba 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 @@ -4,13 +4,7 @@ - Kubernetes for running CI jobs with your CI system's Kubernetes Runner. -### Prepare the environment - -(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 -``` +{% include configurator/partials/ci/buildah_ubuntu.md.liquid %} ### Basic Runner configuration (no caching)