Build in parallel, add sword builder

.gitlab-ci.yml

@@ -3,15 +3,17 @@ stages:
 
 build:
   stage: build
+  parallel:
+    matrix:
+      - IMG:
+        - vm-test
+        - sword-container-builder
   tags:
     - nix
     - podman
   script:
     - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - |-
+    - nix build ".#${IMG}"
-      for img in vm-test; do
+    - podman load -i result
-        nix build ".#${img}"
+    - podman tag "localhost/${IMG}:latest" $CI_REGISTRY/greg/ci-images/${IMG}:latest
-        podman load -i result
+    - podman push "$CI_REGISTRY/greg/ci-images/${IMG}:latest"
-        podman tag "localhost/${img}:latest" $CI_REGISTRY/greg/ci-images/${img}:latest
-        podman push "$CI_REGISTRY/greg/ci-images/${img}:latest"
-      done

flake.nix

@@ -22,6 +22,22 @@
 				config.allowUnfree = true;
 			};
 			packages = {
+				sword-container-builder = pkgs.dockerTools.buildLayeredImage {
+					name = "sword-container-builder";
+					tag = "latest";
+					contents = with pkgs; [
+						podman
+						dockerTools.binSh
+						dockerTools.caCertificates
+						coreutils
+						gnugrep
+						sword
+						dockerTools.usrBinEnv
+					];
+					config.Env = [
+						"CURL_CA_BUNDLE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"
+					];
+				};
 				vm-test = let
 					basicPython = (pkgs.python3.withPackages (p: with p; [ pyyaml ]));
 				in pkgs.dockerTools.buildLayeredImage {