From 74490ce7ac8cc34bedcb9591e98726cc3edbc98e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gregor.kleen@ifi.lmu.de>
Date: Fri, 17 Sep 2021 21:51:49 +0200
Subject: [PATCH] chore(gitlab-ci): ...

---
 .gitlab-ci.yml         | 29 ++++++++++++++---------------
 nix/docker/default.nix |  6 ++++--
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 15d5ab267..d22e8f975 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ node dependencies:
   stage: frontend:build
   script:
     - nix -L build -o result .#uniworxNodeDependencies
-    - nix-store --export $(nix-store -qR result) > node-dependencies.nar
+    - nix-store --export $(nix-store -qR result) | xz > node-dependencies.nar.xz
   before_script: &nix-before
     - mkdir -p /etc/nix
     - install -m 0644 .gitlab-ci/nix-bootstrap.conf /etc/nix/nix.conf
@@ -36,7 +36,7 @@ node dependencies:
     - install -v -T -m 0644 "${FONTAWESOME_NPM_AUTH_FILE}" /etc/fontawesome-token
   artifacts:
     paths:
-      - node-dependencies.nar
+      - node-dependencies.nar.xz
     name: "${CI_JOB_NAME}-${CI_COMMIT_SHORT_SHA}"
     expire_in: "1 day"
   retry: 2
@@ -45,16 +45,16 @@ node dependencies:
 well known:
   stage: frontend:build
   script:
-    - nix-store --import <node-dependencies.nar
+    - xzcat node-dependencies.nar.xz | nix-store --import
     - nix -L build -o result .#uniworxWellKnown
-    - nix-store --export $(nix-store -qR result) > well-known.nar
+    - nix-store --export $(nix-store -qR result) | xz > well-known.nar.xz
   before_script: *nix-before
   needs:
     - job: node dependencies
       artifacts: true
   artifacts:
     paths:
-      - well-known.nar
+      - well-known.nar.xz
     name: "${CI_JOB_NAME}-${CI_COMMIT_SHORT_SHA}"
     expire_in: "1 day"
   retry: 2
@@ -63,10 +63,10 @@ well known:
 frontend:
   stage: frontend:build
   script:
-    - nix-store --import <node-dependencies.nar
-    - nix-store --import <well-known.nar
+    - xzcat node-dependencies.nar.xz | nix-store --import
+    - xzcat well-known.nar.xz | nix-store --import
     - nix -L build -o result .#uniworxFrontend
-    - nix-store --export $(nix-store -qR result) > frontend.nar
+    - nix-store --export $(nix-store -qR result) | xz > frontend.nar.xz
   before_script: *nix-before
   needs:
     - job: node dependencies
@@ -75,7 +75,7 @@ frontend:
       artifacts: true
   artifacts:
     paths:
-      - frontend.nar
+      - frontend.nar.xz
     name: "${CI_JOB_NAME}-${CI_COMMIT_SHORT_SHA}"
     expire_in: "1 day"
   retry: 2
@@ -84,18 +84,17 @@ frontend:
 backend:
   stage: backend:build
   script:
-    - nix-store --import <frontend.nar
+    - xzcat frontend.nar.xz | nix-store --import
     - nix -L build -o result .#uniworxBackend
     - cp -pr --reflink=auto -L result/bin .
-    - nix-store --export $(nix-store -qR result) > backend.nar
+    - nix-store --export $(nix-store -qR result) | xz > backend.nar.xz
   before_script: *nix-before
   needs:
     - job: frontend
       artifacts: true
   artifacts:
     paths:
-      - bin/
-      - backend.nar
+      - backend.nar.xz
     name: "${CI_JOB_NAME}-${CI_COMMIT_SHORT_SHA}"
     expire_in: "1 day"
   retry: 2
@@ -104,7 +103,7 @@ backend:
 demo docker:
   stage: docker:build
   script:
-    - nix-store --import <backend.nar
+    - xzcat backend.nar.xz | nix-store --import
     - nix -L build -o result .#uniworxDemoDocker
     - cp -pr --reflink=auto -L result uniworx-demo.tar.gz
   before_script: *nix-before
@@ -122,7 +121,7 @@ demo docker:
 docker:
   stage: docker:build
   script:
-    - nix-store --import <backend.nar
+    - xzcat backend.nar.xz | nix-store --import
     - nix -L build -o result .#uniworxDocker
     - cp -pr --reflink=auto -L result uniworx.tar.gz
   before_script: *nix-before
diff --git a/nix/docker/default.nix b/nix/docker/default.nix
index beb2d9354..514e82bf1 100644
--- a/nix/docker/default.nix
+++ b/nix/docker/default.nix
@@ -131,8 +131,10 @@ in
     tag = fromImage.imageTag;
     fromImage = prev.docker-nixpkgs.nix-unstable;
 
-    contents = [
-      final.bash final.coreutils final.minio-client
+    contents = with final; [
+      bash coreutils
+      minio-client
+      xz
     ];
   };
 } // mapAttrs (_name: mkUniworxDocker) {