From 1431f864ce660cd0d7eb6c46f17b2658f2bf6986 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Thu, 11 May 2023 09:09:50 +0000 Subject: [PATCH 01/10] chore(url): update gitlab url --- templates/i18n/implementation/de-de-formal.hamlet | 4 ++-- templates/i18n/implementation/en-eu.hamlet | 4 ++-- templates/widgets/footer/footer.hamlet | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/i18n/implementation/de-de-formal.hamlet b/templates/i18n/implementation/de-de-formal.hamlet index cb4f84f95..22c46ab30 100644 --- a/templates/i18n/implementation/de-de-formal.hamlet +++ b/templates/i18n/implementation/de-de-formal.hamlet @@ -48,5 +48,5 @@ $# SPDX-License-Identifier: AGPL-3.0-or-later .
Der Quellcode der Uni2work-Software ist über folgenden Link öffentlich verfügbar: # - - https://gitlab.com/fradrive/fradrive + + https://gitlab.uniworx.de/fradrive/fradrive diff --git a/templates/i18n/implementation/en-eu.hamlet b/templates/i18n/implementation/en-eu.hamlet index 1d4df3702..0db29e7cc 100644 --- a/templates/i18n/implementation/en-eu.hamlet +++ b/templates/i18n/implementation/en-eu.hamlet @@ -47,5 +47,5 @@ $# SPDX-License-Identifier: AGPL-3.0-or-later .
The source code of the Uni2work software is publicly available via the following link: # - - https://gitlab.com/fradrive/fradrive + + https://gitlab.uniworx.de/fradrive/fradrive diff --git a/templates/widgets/footer/footer.hamlet b/templates/widgets/footer/footer.hamlet index 87cb86588..35978ca50 100644 --- a/templates/widgets/footer/footer.hamlet +++ b/templates/widgets/footer/footer.hamlet @@ -9,5 +9,5 @@ $# SPDX-License-Identifier: AGPL-3.0-or-later $forall n <- filter isNavFooter nav ^{navWidget n}
  • - + _{MsgUni2workSource} From 9f0f7fec48e2252f84d71243f000f6eb9b7c3bcb Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 16 May 2023 23:27:14 +0000 Subject: [PATCH 02/10] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6c8ccd9ac..a744e40c8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,12 +33,6 @@ node dependencies: - nix -L build -o result "${FLAKE}#uniworxNodeDependencies" - nix-store --export $(nix-store -qR result) | xz -T0 -2 > node-dependencies.nar.xz before_script: &nix-before - - mkdir -p /etc/nix - - install -m 0644 .gitlab-ci/nix-bootstrap.conf /etc/nix/nix.conf - - .gitlab-ci/write-minio-creds.sh - - .gitlab-ci/make-minio-bucket.sh - - cp -pr --reflink=auto -L .gitlab-ci/upload-to-cache.sh /etc/nix/upload-to-cache.sh - - install -m 0644 .gitlab-ci/nix.conf /etc/nix/nix.conf - git config --global init.defaultBranch master - install -v -m 0700 -d ~/.ssh - install -v -T -m 0644 "${SSH_KNOWN_HOSTS}" ~/.ssh/known_hosts From f5c4142e13d084de905d4f43c70440cfb7d0d4ff Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 16 May 2023 23:35:06 +0000 Subject: [PATCH 03/10] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a744e40c8..566098ed5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Gregor Kleen ,Sarah Vaupel +# SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Gregor Kleen # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -33,6 +33,7 @@ node dependencies: - nix -L build -o result "${FLAKE}#uniworxNodeDependencies" - nix-store --export $(nix-store -qR result) | xz -T0 -2 > node-dependencies.nar.xz before_script: &nix-before + - mkdir -p /etc/nix - git config --global init.defaultBranch master - install -v -m 0700 -d ~/.ssh - install -v -T -m 0644 "${SSH_KNOWN_HOSTS}" ~/.ssh/known_hosts From 5365a7d123053832265faf31af8e15d8ad559878 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 16 May 2023 23:39:00 +0000 Subject: [PATCH 04/10] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 566098ed5..093e870ae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,6 +34,7 @@ node dependencies: - nix-store --export $(nix-store -qR result) | xz -T0 -2 > node-dependencies.nar.xz before_script: &nix-before - mkdir -p /etc/nix + - install -m 0644 .gitlab-ci/nix.conf /etc/nix/nix.conf - git config --global init.defaultBranch master - install -v -m 0700 -d ~/.ssh - install -v -T -m 0644 "${SSH_KNOWN_HOSTS}" ~/.ssh/known_hosts From 8d65e7708b2379d3dd58a3bf782428b8754e78da Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 16 May 2023 23:42:48 +0000 Subject: [PATCH 05/10] Update nix.conf --- .gitlab-ci/nix.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitlab-ci/nix.conf b/.gitlab-ci/nix.conf index 545c35920..f1fc3be60 100644 --- a/.gitlab-ci/nix.conf +++ b/.gitlab-ci/nix.conf @@ -1,6 +1,2 @@ sandbox = true experimental-features = nix-command flakes -substituters = https://cache.iog.io https://cache.nixos.org/ s3://nix-cache?scheme=http&endpoint=minio-gitlab-runner-cache -trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= minio-gitlab-runner-cache:ZN5neq93MHqpnieHSBlxGgWvCL0WKrZ2S9QS+U5Bnro= -require-sigs = true -post-build-hook = /etc/nix/upload-to-cache.sh \ No newline at end of file From 710da5f0020e831bb0c39305d5e18ceb5c3f8537 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 16 May 2023 23:45:53 +0000 Subject: [PATCH 06/10] Update flake.nix --- flake.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 65b330f7a..4b9ba53e8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022-2023 Gregor Kleen , Sarah Vaupel +# SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Gregor Kleen # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -146,8 +146,8 @@ }; apps = haskellFlake.apps // { - pushUniworxDemoDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "uniworx-demo"; dockerImage = pkgs.uniworxDemoDocker; defaultRegistry = "docker://registry.gitlab.com/fradrive/fradrive"; }; }; - pushUniworxDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "uniworx"; dockerImage = pkgs.uniworxDocker; defaultRegistry = "docker://registry.gitlab.com/fradrive/fradrive" }; }; + pushUniworxDemoDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "uniworx-demo"; dockerImage = pkgs.uniworxDemoDocker; defaultRegistry = "docker://registry.gitlab.uniworx.de/fradrive/fradrive"; }; }; + pushUniworxDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "uniworx"; dockerImage = pkgs.uniworxDocker; defaultRegistry = "docker://registry.gitlab.uniworx.de/fradrive/fradrive"; }; }; pushCIDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "nix-unstable"; dockerImage = pkgs.ciDocker; }; }; calculateMaterializedSha = flake-utils.lib.mkApp { drv = pkgs.uniworx.stack-nix.passthru.calculateMaterializedSha; execPath = ""; }; jqChangelogJson = flake-utils.lib.mkApp { drv = pkgs.jqChangelogJson; }; From 3a1e8e7c160818229d419c274210ee8dd4b0b290 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 19 May 2023 05:54:42 +0000 Subject: [PATCH 07/10] chore(gitlab-ci): use container image with automagic caching --- .gitlab-ci.yml | 16 +++++++++------- .gitlab-ci/nix-bootstrap.conf | 5 ----- .gitlab-ci/nix-bootstrap.conf.license | 3 --- .gitlab-ci/nix.conf | 2 -- .gitlab-ci/nix.conf.license | 3 --- 5 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 .gitlab-ci/nix-bootstrap.conf delete mode 100644 .gitlab-ci/nix-bootstrap.conf.license delete mode 100644 .gitlab-ci/nix.conf delete mode 100644 .gitlab-ci/nix.conf.license diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 093e870ae..b2c0aa9b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Gregor Kleen +# SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Gregor Kleen # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -10,14 +10,18 @@ workflow: default: image: - name: registry.uniworx.de/fradrive/fradrive/nix-unstable:0.2.0 + name: registry.uniworx.de/uniworx/containers/nix-attic:latest variables: NIX_PATH: "nixpkgs=http://nixos.org/channels/nixos-21.05/nixexprs.tar.xz" AWS_SHARED_CREDENTIALS_FILE: "/etc/aws/credentials" TRANSFER_METER_FREQUENCY: "2s" - + + NIX_CONFIG: |- + extra-substituters = https://cache.iog.io + extra-trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= + stages: - frontend:build - backend:build @@ -25,7 +29,7 @@ stages: - docker - prepare release - release - + node dependencies: stage: frontend:build script: @@ -33,12 +37,10 @@ node dependencies: - nix -L build -o result "${FLAKE}#uniworxNodeDependencies" - nix-store --export $(nix-store -qR result) | xz -T0 -2 > node-dependencies.nar.xz before_script: &nix-before - - mkdir -p /etc/nix - - install -m 0644 .gitlab-ci/nix.conf /etc/nix/nix.conf - git config --global init.defaultBranch master - install -v -m 0700 -d ~/.ssh - install -v -T -m 0644 "${SSH_KNOWN_HOSTS}" ~/.ssh/known_hosts - - install -v -T -m 0400 "${SSH_DEPLOY_KEY}" ~/.ssh/deploy && echo "IdentityFile ~/.ssh/deploy" >> ~/.ssh/config; + - install -v -T -m 0400 "${SSH_DEPLOY_KEY}" ~/.ssh/deploy && echo "IdentityFile ~/.ssh/deploy" >> ~/.ssh/config; - install -v -T -m 0644 "${FONTAWESOME_NPM_AUTH_FILE}" /etc/fontawesome-token - install -v -T -m 0644 "${NIX_NETRC}" /etc/nix/netrc - | diff --git a/.gitlab-ci/nix-bootstrap.conf b/.gitlab-ci/nix-bootstrap.conf deleted file mode 100644 index 161508eed..000000000 --- a/.gitlab-ci/nix-bootstrap.conf +++ /dev/null @@ -1,5 +0,0 @@ -sandbox = true -experimental-features = nix-command flakes -substituters = https://cache.iog.io https://cache.nixos.org/ -trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= -require-sigs = true \ No newline at end of file diff --git a/.gitlab-ci/nix-bootstrap.conf.license b/.gitlab-ci/nix-bootstrap.conf.license deleted file mode 100644 index 0544bf968..000000000 --- a/.gitlab-ci/nix-bootstrap.conf.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2022 Gregor Kleen - -SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/.gitlab-ci/nix.conf b/.gitlab-ci/nix.conf deleted file mode 100644 index f1fc3be60..000000000 --- a/.gitlab-ci/nix.conf +++ /dev/null @@ -1,2 +0,0 @@ -sandbox = true -experimental-features = nix-command flakes diff --git a/.gitlab-ci/nix.conf.license b/.gitlab-ci/nix.conf.license deleted file mode 100644 index 0544bf968..000000000 --- a/.gitlab-ci/nix.conf.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2022 Gregor Kleen - -SPDX-License-Identifier: AGPL-3.0-or-later From c0bb182ecf557b0b173371ca99e048f0e167cb48 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 19 May 2023 09:51:09 +0000 Subject: [PATCH 08/10] chore(nix): bump hash of uniworxWellKnown --- nix/uniworx/well-known.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/uniworx/well-known.nix b/nix/uniworx/well-known.nix index d23d3a836..afd702231 100644 --- a/nix/uniworx/well-known.nix +++ b/nix/uniworx/well-known.nix @@ -21,6 +21,6 @@ ''; outputHashMode = "recursive"; - outputHash = "sha256-zntsIUu13s5doijk3C8ZniYDlDdHZ5Isbv0SQLNgt08="; + outputHash = "sha256-18MfdmJX3q826Q4p2F3SnwS2fCjLN0LUpIV/jqUPH4I=="; }; } From d1ae65bf8ffe5946fe38301e380f7654ff65932c Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sat, 20 May 2023 00:42:31 +0000 Subject: [PATCH 09/10] chore(release): 27.4.4 --- CHANGELOG.md | 2 ++ nix/docker/demo-version.json | 2 +- nix/docker/version.json | 2 +- package-lock.json | 2 +- package.json | 2 +- package.yaml | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4cf21ae61..73ea16a76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [27.4.4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.3...v27.4.4) (2023-05-20) + ## [27.4.3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.2...v27.4.3) (2023-05-12) ## [27.4.2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.1...v27.4.2) (2023-05-09) diff --git a/nix/docker/demo-version.json b/nix/docker/demo-version.json index 45e18a925..386c4e48e 100644 --- a/nix/docker/demo-version.json +++ b/nix/docker/demo-version.json @@ -1,3 +1,3 @@ { - "version": "27.4.3" + "version": "27.4.4" } diff --git a/nix/docker/version.json b/nix/docker/version.json index 45e18a925..386c4e48e 100644 --- a/nix/docker/version.json +++ b/nix/docker/version.json @@ -1,3 +1,3 @@ { - "version": "27.4.3" + "version": "27.4.4" } diff --git a/package-lock.json b/package-lock.json index 7a9e83a50..203e22b72 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.3", + "version": "27.4.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 5a575e6a3..8517a6591 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.3", + "version": "27.4.4", "description": "", "keywords": [], "author": "", diff --git a/package.yaml b/package.yaml index 098c9524b..eece421cc 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: uniworx -version: 27.4.3 +version: 27.4.4 dependencies: - base - yesod From d15cdf29e1ac08601c2c708a713ef1ca912c1dbe Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 22 May 2023 08:08:34 +0000 Subject: [PATCH 10/10] chore(nix): fix registry url --- flake.lock | 17 ------------ flake.nix | 20 +++++--------- nix/docker/ci-version.json | 3 --- nix/docker/ci-version.json.license | 3 --- nix/docker/default.nix | 43 +++++++++--------------------- 5 files changed, 18 insertions(+), 68 deletions(-) delete mode 100644 nix/docker/ci-version.json delete mode 100644 nix/docker/ci-version.json.license diff --git a/flake.lock b/flake.lock index ffa6b2777..427561469 100644 --- a/flake.lock +++ b/flake.lock @@ -151,22 +151,6 @@ "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/cryptonite.git" } }, - "docker-nixpkgs": { - "flake": false, - "locked": { - "lastModified": 1678089139, - "narHash": "sha256-cK0RDcxR4eWMrdZIcqNVqnjo9k2LwVmNZO3qj1ctDXU=", - "owner": "nix-community", - "repo": "docker-nixpkgs", - "rev": "2205fb4968adf683324e6d0401b74b9d250d8f56", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "docker-nixpkgs", - "type": "github" - } - }, "encoding": { "flake": false, "locked": { @@ -520,7 +504,6 @@ "conduit-resumablesink": "conduit-resumablesink", "cryptoids": "cryptoids", "cryptonite": "cryptonite", - "docker-nixpkgs": "docker-nixpkgs", "encoding": "encoding", "esqueleto": "esqueleto", "flake-utils": "flake-utils", diff --git a/flake.nix b/flake.nix index 4b9ba53e8..fd6e05a48 100644 --- a/flake.nix +++ b/flake.nix @@ -28,11 +28,6 @@ ref = "main"; }; - docker-nixpkgs = { - url = "github:nix-community/docker-nixpkgs"; - flake = false; - }; - encoding = { url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/encoding.git?ref=uni2work"; flake = false; @@ -91,7 +86,7 @@ }; }; - outputs = inputs@{ self, nixpkgs, nixpkgs-recent, docker-nixpkgs, flake-utils, haskell-nix, ... }: flake-utils.lib.eachSystem ["x86_64-linux"] + outputs = inputs@{ self, nixpkgs, nixpkgs-recent, flake-utils, haskell-nix, ... }: flake-utils.lib.eachSystem ["x86_64-linux"] (system: let frontendSource = pkgs.lib.sourceByRegex ./. [ "^(assets|frontend)(/.*)?$" @@ -116,8 +111,6 @@ }; overlays = [ - (import "${docker-nixpkgs}/overlay.nix") - (final: prev: let pkgs-recent = import nixpkgs-recent { inherit system; }; in { inherit (pkgs-recent) dockerTools node2nix stack glibcLocalesUtf8 tzdata chromium minio minio-client skopeo; inherit (pkgs-recent.stdenv) fetchurlBoot; }) @@ -134,9 +127,9 @@ mkPushDocker = { imageName, dockerImage, defaultRegistry ? "docker://registry.uniworx.de/fradrive/fradrive" }: pkgs.writeScriptBin "push-${dockerImage.imageName}" '' #!${pkgs.zsh}/bin/zsh -xe - target=''${1-${defaultRegistry}/${imageName}:${dockerImage.imageTag}} + target=''${1:-${defaultRegistry}/${imageName}:${dockerImage.imageTag}} [[ -n "''${1}" ]] && shift - ${pkgs.skopeo}/bin/skopeo ''${@} --insecure-policy copy docker-archive://${dockerImage} ''${target} + ${pkgs.skopeo}/bin/skopeo --tmpdir ''${TMPDIR:-/var/tmp} ''${@} --insecure-policy copy docker-archive://${dockerImage} ''${target} ''; inherit (pkgs.lib) recursiveUpdate; @@ -146,10 +139,9 @@ }; apps = haskellFlake.apps // { - pushUniworxDemoDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "uniworx-demo"; dockerImage = pkgs.uniworxDemoDocker; defaultRegistry = "docker://registry.gitlab.uniworx.de/fradrive/fradrive"; }; }; - pushUniworxDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "uniworx"; dockerImage = pkgs.uniworxDocker; defaultRegistry = "docker://registry.gitlab.uniworx.de/fradrive/fradrive"; }; }; - pushCIDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "nix-unstable"; dockerImage = pkgs.ciDocker; }; }; - calculateMaterializedSha = flake-utils.lib.mkApp { drv = pkgs.uniworx.stack-nix.passthru.calculateMaterializedSha; execPath = ""; }; + pushUniworxDemoDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "uniworx-demo"; dockerImage = pkgs.uniworxDemoDocker; }; }; + pushUniworxDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "uniworx"; dockerImage = pkgs.uniworxDocker; }; }; + calculateMaterializedSha = flake-utils.lib.mkApp { drv = pkgs.uniworx.stack-nix.passthru.calculateMaterializedSha; exePath = ""; }; jqChangelogJson = flake-utils.lib.mkApp { drv = pkgs.jqChangelogJson; }; }; diff --git a/nix/docker/ci-version.json b/nix/docker/ci-version.json deleted file mode 100644 index 10e64e00d..000000000 --- a/nix/docker/ci-version.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "version": "0.2.0" -} diff --git a/nix/docker/ci-version.json.license b/nix/docker/ci-version.json.license deleted file mode 100644 index 0544bf968..000000000 --- a/nix/docker/ci-version.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2022 Gregor Kleen - -SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/nix/docker/default.nix b/nix/docker/default.nix index d452f8849..e488b1b3a 100644 --- a/nix/docker/default.nix +++ b/nix/docker/default.nix @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Gregor Kleen ,Sarah Vaupel ,Steffen Jost ,Steffen Jost +# SPDX-FileCopyrightText: 2022-2023 Gregor Kleen , Sarah Vaupel , Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -13,35 +13,35 @@ let printf '%s' $(date -Is -d '@${toString self.lastModified}') > $out ''); in if self ? lastModified then fromDate else "1970-01-01T00:00:01Z"; - + mkUniworxDocker = { isDemo }: prev.dockerTools.buildImage { name = "uniworx${optionalString isDemo "-demo"}"; tag = let versionFile = if isDemo then ./demo-version.json else ./version.json; in (builtins.fromJSON (prev.lib.readFile versionFile)).version; - inherit created; + inherit created; contents = with final; [ uniworx.uniworx.components.exes.uniworx - prev.dockerTools.binSh findutils coreutils + prev.dockerTools.binSh findutils coreutils iana-etc - # for PDF creation with Pandoc and LuaTeX + # for PDF creation with Pandoc and LuaTeX #cups # needed for interface with print center -- did not work as intended, requires lpd running busybox # should provide a working lpr -- to be tested htop pdftk # for encrypting pdfs #texlive.combined.scheme-medium # too large for container in LMU build environment. - (texlive.combine { - inherit (texlive) scheme-basic + (texlive.combine { + inherit (texlive) scheme-basic babel-german babel-english booktabs textpos enumitem eurosym koma-script parskip xcolor dejavu - # required fro LuaTeX + # required fro LuaTeX luatexbase lualatex-math unicode-math selnolig ; - }) + }) # just for manual testing within the pod, may be removef for production? - curl wget netcat openldap + curl wget netcat openldap unixtools.netstat htop gnugrep locale ] ++ optionals isDemo [ postgresql_12 memcached uniworx.uniworx.components.exes.uniworxdb ]; @@ -61,7 +61,7 @@ let install -d -g uniworx -o uniworx -m 0755 /var/log/uniworx # just to see how to create directories here - mkdir -p /testdir + mkdir -p /testdir ${optionalString isDemo '' install -d -g uniworx -o uniworx -m 0750 /var/lib/postgres @@ -148,26 +148,7 @@ let }; }; in -{ - ciDocker = prev.dockerTools.buildImageWithNixDb rec { - name = "uniworx-ci"; - inherit created; - tag = (builtins.fromJSON (prev.lib.readFile ./ci-version.json)).version; - fromImage = prev.docker-nixpkgs.nix-unstable; - - contents = with final; [ - bash coreutils - minio-client - xz - ]; - - runAsRoot = '' - #!${final.stdenv.shell} - - ${final.coreutils}/bin/install -v -m 0777 -d /var/tmp - ''; - }; -} // mapAttrs (_name: mkUniworxDocker) { +mapAttrs (_name: mkUniworxDocker) { uniworxDemoDocker = { isDemo = true; }; uniworxDocker = { isDemo = false; }; }