TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 02:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update flyway and set jdk17 as requirement

Browse Source
This commit is contained in:
eikek
2023-11-05 23:11:22 +01:00
parent 46faa7aa40
commit bf0f692cd9
6 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -9,7 +9,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
java: [ 'openjdk@1.11' ] java: [ 'openjdk@1.17' ]
steps: steps:
- uses: actions/checkout@v4.1.1 - uses: actions/checkout@v4.1.1
with: with:

2
nix/checks/configuration-test.nix
View File

@ -75,7 +75,7 @@ in
pkgs.jq pkgs.jq
pkgs.inetutils pkgs.inetutils
pkgs.htop pkgs.htop
pkgs.openjdk pkgs.jdk17
]; ];

8
nix/flake.nix
View File

@ -34,7 +34,7 @@
pname = "docspell-server"; pname = "docspell-server";
src = fetchzip current_version.server; src = fetchzip current_version.server;
buildInputs = [ jdk11 ]; buildInputs = [ jdk17 ];
buildPhase = "true"; buildPhase = "true";
installPhase = '' installPhase = ''
@ -42,7 +42,7 @@
cp -R * $out/docspell-restserver-${version}/ cp -R * $out/docspell-restserver-${version}/
cat > $out/bin/docspell-restserver <<-EOF cat > $out/bin/docspell-restserver <<-EOF
#!${bash}/bin/bash #!${bash}/bin/bash
$out/docspell-restserver-${version}/bin/docspell-restserver -java-home ${jdk11} "\$@" $out/docspell-restserver-${version}/bin/docspell-restserver -java-home ${jdk17} "\$@"
EOF EOF
chmod 755 $out/bin/docspell-restserver chmod 755 $out/bin/docspell-restserver
''; '';
@ -54,7 +54,7 @@
src = fetchzip current_version.joex; src = fetchzip current_version.joex;
buildInputs = [ jdk11 ]; buildInputs = [ jdk17 ];
buildPhase = "true"; buildPhase = "true";
@ -63,7 +63,7 @@
cp -R * $out/docspell-joex-${version}/ cp -R * $out/docspell-joex-${version}/
cat > $out/bin/docspell-joex <<-EOF cat > $out/bin/docspell-joex <<-EOF
#!${bash}/bin/bash #!${bash}/bin/bash
$out/docspell-joex-${version}/bin/docspell-joex -java-home ${jdk11} "\$@" $out/docspell-joex-${version}/bin/docspell-joex -java-home ${jdk17} "\$@"
EOF EOF
chmod 755 $out/bin/docspell-joex chmod 755 $out/bin/docspell-joex
''; '';

3
project/Dependencies.scala
View File

@ -19,7 +19,7 @@ object Dependencies {
val DoobieVersion = "1.0.0-RC2" val DoobieVersion = "1.0.0-RC2"
val EmilVersion = "0.13.0" val EmilVersion = "0.13.0"
val FlexmarkVersion = "0.64.8" val FlexmarkVersion = "0.64.8"
val FlywayVersion = "9.22.3" val FlywayVersion = "10.0.0"
val Fs2Version = "3.9.2" val Fs2Version = "3.9.2"
val H2Version = "2.2.224" val H2Version = "2.2.224"
val Http4sVersion = "0.23.23" val Http4sVersion = "0.23.23"
@ -311,6 +311,7 @@ object Dependencies {
// ASL 2.0 // ASL 2.0
val flyway = Seq( val flyway = Seq(
"org.flywaydb" % "flyway-core" % FlywayVersion, "org.flywaydb" % "flyway-core" % FlywayVersion,
"org.flywaydb" % "flyway-database-postgresql" % FlywayVersion,
"org.flywaydb" % "flyway-mysql" % FlywayVersion "org.flywaydb" % "flyway-mysql" % FlywayVersion
) )

6
project/build.nix
View File

@ -1,19 +1,19 @@
let let
nixpkgs = builtins.fetchTarball { nixpkgs = builtins.fetchTarball {
#url = "https://github.com/NixOS/nixpkgs/archive/92e990a8d6bc35f1089c76dd8ba68b78da90da59.tar.gz"; #url = "https://github.com/NixOS/nixpkgs/archive/92e990a8d6bc35f1089c76dd8ba68b78da90da59.tar.gz";
url = "channel:nixos-21.11"; url = "channel:nixos-23.05";
}; };
pkgs = import nixpkgs { }; pkgs = import nixpkgs { };
initScript = pkgs.writeScript "docspell-build-init" '' initScript = pkgs.writeScript "docspell-build-init" ''
export LD_LIBRARY_PATH= export LD_LIBRARY_PATH=
${pkgs.bash}/bin/bash -c "sbt -mem 4096 -java-home ${pkgs.openjdk11}/lib/openjdk" ${pkgs.bash}/bin/bash -c "sbt -mem 4096 -java-home ${pkgs.openjdk17}/lib/openjdk"
''; '';
in with pkgs; in with pkgs;
buildFHSUserEnv { buildFHSUserEnv {
name = "docspell-sbt"; name = "docspell-sbt";
targetPkgs = pkgs: with pkgs; [ targetPkgs = pkgs: with pkgs; [
netcat jdk11 wget which dpkg sbt git elmPackages.elm ncurses fakeroot mc netcat jdk17 wget which dpkg sbt git elmPackages.elm ncurses fakeroot mc
zola yarn zola yarn
# haskells http client needs this (to download elm packages) # haskells http client needs this (to download elm packages)

6
website/site/content/docs/install/prereq.md
View File

@ -23,9 +23,9 @@ It is enough to install the JRE. The JDK is required, if you want to
build docspell from source. For newer versions, the JRE is not shipped build docspell from source. For newer versions, the JRE is not shipped
anymore, simply use JDK then. anymore, simply use JDK then.
Docspell has been tested with Java 11 (or sometimes referred to as JDK Docspell has been tested with Java 17 (or sometimes referred to as JDK
11). The provided packages are build using JDK 11. However, it also 17). The provided packages are build using JDK 17. However, it also
works on newer java versions. The provided docker images use JDK11. works on newer java versions. The provided docker images use JDK17.
The next tools are only required on machines running the *Joex* The next tools are only required on machines running the *Joex*
component. component.