WIP

Author: perlpunk

container/devel/.gitignore

@@ -22,13 +22,11 @@ You will run two containers:
   both can use the same postgres container.
   In this example we will be settting up and using the Leap container.
 
-You can run the openQA container with `distrobox`, for example,
-for easy handling (network, home directory, permissions, and graphical
-environment will just work).
+`distrobox`, for example, can be used, to take care of network, home directory,
+permissions, and graphical environment.
 
 Some common settings we are using here:
-* A directory which contains everything: git repos, openQA config, assets etc.
-   * `OPENQA_BASEDIR=$HOME/openqadev.leap`
+* `OPENQA_BASEDIR=$HOME/openqadev.leap`
 * Database name: `openqa-local`
 * Database user: `geekotest`
 * Database container name: `postgres-openqa`
@@ -68,19 +66,6 @@ export OPENQA_KEY=1234567890ABCDEF
 export OPENQA_SECRET=1234567890ABCDEF
 ```
 
-## Create Directories, Clone Git
-
-```
-source ~/localopenqa.leap.sh
-mkdir $OPENQA_BASEDIR
-mkdir $OPENQA_REPOS
-mkdir $OPENQA_BASEDIR/openqa $OPENQA_CONFIG $OPENQA_BASEDIR/perl5 $OPENQA_BASEDIR/openqa/db
-
-git clone [email protected]:os-autoinst/openQA $OPENQA_REPOS/openQA
-git clone [email protected]:os-autoinst/os-autoinst $OPENQA_REPOS/os-autoinst
-git clone [email protected]:os-autoinst/scripts $OPENQA_REPOS/scripts
-```
-
 ## Setting up a separate Postgres Container
 
 To be able to keep the database when stopping the container, we create a
@@ -109,6 +94,42 @@ createuser -D -P geekotest
 createdb -O geekotest openqa-local
 ```
 
+## Install requirements in distrobox
+
+You can use a leap container and install the requirements, but you can also
+build your own container with the requirements already installed.
+```
+distrobox create -i registry.opensuse.org/opensuse/leap:15.6 -n box-openqadev
+distrobox enter box-openqadev
+
+# Install packages
+zypper addrepo -G -p 95 https://download.opensuse.org/repositories/devel:/openQA/15.6 devel-openqa \
+    && zypper addrepo -G -p 95 https://download.opensuse.org/repositories/devel:/openQA:/Leap:/15.6/15.6/ devel-openqa-leap \
+    && zypper addrepo -G -p 95 https://download.opensuse.org/repositories/SUSE:/CA/15.6/SUSE:CA.repo \
+    && zypper -n ref \
+    && zypper -n install ca-certificates-suse \
+        os-autoinst-devel openQA-devel \
+        os-autoinst-scripts-deps \
+        os-autoinst-scripts-deps-devel \
+        openssh-clients \
+        crudini
+# plus your favourite dev tools, e.g. tmux
+```
+
+## Create Directories, Clone Git
+
+```
+# Remember to source this file
+source ~/localopenqa.leap.sh
+mkdir $OPENQA_BASEDIR
+mkdir $OPENQA_REPOS
+mkdir $OPENQA_BASEDIR/openqa $OPENQA_CONFIG $OPENQA_BASEDIR/perl5 $OPENQA_BASEDIR/openqa/db
+
+git clone [email protected]:os-autoinst/openQA $OPENQA_REPOS/openQA
+git clone [email protected]:os-autoinst/os-autoinst $OPENQA_REPOS/os-autoinst
+git clone [email protected]:os-autoinst/scripts $OPENQA_REPOS/scripts
+```
+
 ## Preparing Config Files
 
 ```
@@ -133,26 +154,10 @@ cp $OPENQA_REPOS/openQA/etc/openqa/openqa.ini $OPENQA_CONFIG/openqa.ini
 crudini --set $OPENQA_CONFIG/openqa.ini auth method Fake
 ```
 
-## Building the Container
 
-```
-cd $OPENQA_REPOS/openQA/container/devel
-# Optionally put any favourite development tools into ./scripts/custom.sh
-make tools/openqadevel.leap
-```
+## Build openQA
 
-## Enter the container, Last Build Steps
-
-Now you can use the container with `distrobox`:
-```
-distrobox create -i localhost/tools/openqadev.leap -n box-openqadev
-distrobox enter box-openqadev
-```
-In the box:
 ```
-# Remember to source this file
-source ~/localopenqa.leap.sh
-
 # Build steps
 cd $OPENQA_REPOS/os-autoinst
 make