Small cleanups

Ramblurr · Oct 31, 2024 · 4ec4a9e · 4ec4a9e
1 parent 2e54be5
commit 4ec4a9e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,6 +28,10 @@ jobs:
         run: nix build .#datomic-pro
       - name: Build datomic-pro oci image
         run: nix build .#datomic-pro-container -o container
+      - name: Build datomic-pro oci image unstable
+        run: nix build .#datomic-pro-container-unstable -o container
+      - name: Build datomic-pro-peer nix package
+        run: nix build .#datomic-pro-peer
       - name: Run NixOS module tests
         run: nix flake check
 

diff --git a/pkgs/datomic-pro-container-image.nix b/pkgs/datomic-pro-container-image.nix
@@ -1,5 +1,4 @@
 {
-  cacert,
   coreutils,
   datomic-generate-properties,
   datomic-pro,
@@ -24,10 +23,6 @@ let
       mysql_jdbc
     ];
   };
-  entrypointSmall = writeShellScriptBin "datomic-entrypoint" ''
-    #! ${runtimeShell}
-      ${datomicBuild}/bin/datomic-transactor "$DATOMIC_TRANSACTOR_PROPERTIES_PATH"
-  '';
   entrypoint = writeShellScriptBin "datomic-entrypoint" ''
     #! ${runtimeShell}
     set -e
@@ -72,21 +67,14 @@ dockerTools.buildLayeredImage {
   contents = [
     dockerTools.usrBinEnv
     dockerTools.binSh
-    #cacert
-    #datomic-generate-properties
-    #datomicBuild
-    #entrypoint
-    #env-shim
-    #mysql_jdbc
-    #sqlite-jdbc
   ];
   extraCommands = ''
     mkdir -p tmp
     chmod 1777 tmp
   '';
 
   config = {
-    Entrypoint = [ "${entrypointSmall}/bin/datomic-entrypoint" ];
+    Entrypoint = [ "${entrypoint}/bin/datomic-entrypoint" ];
     Env = [
       "DATOMIC_TRANSACTOR_PROPERTIES_PATH=/config/transactor.properties"
       "LC_ALL=C.UTF-8"

diff --git a/pkgs/datomic-pro.nix b/pkgs/datomic-pro.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (
     installPhase = ''
       runHook preInstall
       mkdir -p $out/{bin,lib,share}
-      cp *transactor*.jar $out/lib/
+      mv *transactor*.jar $out/lib/
       rm -rf peer*.jar presto-server
       mkdir -p $out/share/datomic-pro
       cp -R * $out/share/datomic-pro/