From 1bfb921c7ee530768b5d9452893882e93446264d Mon Sep 17 00:00:00 2001 From: Alex Iribarren <Alex.Iribarren@cern.ch> Date: Tue, 16 Feb 2021 10:45:09 +0100 Subject: [PATCH] Consistency --- docs/koji/bootstrapping.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/koji/bootstrapping.md b/docs/koji/bootstrapping.md index 296fe41..cbd07c8 100644 --- a/docs/koji/bootstrapping.md +++ b/docs/koji/bootstrapping.md @@ -292,11 +292,11 @@ so it needs to be adapted to know about the new distro for the next few steps to You can test the new distro support with [myrpm](https://gitlab.cern.ch/linuxsupport/myrpm), although that requires a new tag, which you haven't created yet... -You will start to run into dependency loops now (rpmci assumes you have a docker image of -the new distro, but you haven't created CERN docker images for this distro yet because you +You will start to run into dependency loops now (rpmci assumes you have a Docker image of +the new distro, but you haven't created CERN Docker images for this distro yet because you still don't have the base RPMs, etc.) You'll have to figure out how to bootstrap your way -out of it depending on the case. You can use an upstream docker image to start with and -then eventually replace it, you can build with a different docker image temporarily, +out of it depending on the case. You can use an upstream Docker image to start with and +then eventually replace it, you can build with a different Docker image temporarily, you can build the bare minimum RPMs you need by hand... I'm sure you can figure something out. @@ -337,12 +337,12 @@ required by other stuff, so it's best to get it in early to avoid surprises. Where appropriate, you probably also want to build a `*-release` RPM to configure a machine to point to your new mirrors. You will need to do this before -you can build cloud and docker images. +you can build cloud and Docker images. ### Build other "basic" packages [`cern-wrappers`](https://gitlab.cern.ch/linuxsupport/rpms/cern-wrappers) is installed -in the docker and cloud images, so it needs to be built now. +in the Docker and cloud images, so it needs to be built now. Additionally, `cern-linuxsupport-access`, `phonebook` and `useraddcern` are installed as part of the [CERN functional tests](https://gitlab.cern.ch/linuxsupport/testing/cern_centos_functional_tests/-/blob/master/tests/cern_basic/1_yum_installs.sh) @@ -393,7 +393,7 @@ Adding 1 packages to tag openafs8s-stable ## Create tag for image builds -Now we need to create the tag we'll use to build docker and cloud images. +Now we need to create the tag we'll use to build Docker and cloud images. Note that this tag is completely independant from all the others, as it should only use external repositories. @@ -444,7 +444,7 @@ and probably `config` (for Configuration Management stuff). ## Build a Docker image -You'll need a docker image for many things, starting with `rpmci`. You've gotten +You'll need a Docker image for many things, starting with `rpmci`. You've gotten away without it so far, but now it's time to build it. Start with [c8-base](https://gitlab.cern.ch/linuxsupport/c8-base) as a model and -- GitLab