mirror of https://github.com/micromata/borgbackup-butler.git
parent: 7f78d2ed | patch | commit | show whitespace
Kai Reinhard
19.46.2021 148a992fc967d7c71c9a673f0cffc1c004f4b1f2 
0.6-SNAPSHOT
4 files modified
6 ■■■■■ changed files
borgbutler-docker/app/Dockerfile 2 ●●●●● patch | view | raw | blame | history
borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/ArchivesRest.kt 2 ●●●●● patch | view | raw | blame | history
build.gradle 2 ●●●●● patch | view | raw | blame | history
doc/images/screen-jobmonitor.png patch | view | raw | blame | history 
 borgbutler-docker/app/Dockerfile


@@ -16,7 +16,7 @@


USER borgbutler:borgbutler




# Don't put fat jar files in docker images: https://phauer.com/2019/no-fat-jar-in-docker-image/


ARG DEPENDENCY=target/dependency/borgbutler-server-0.5


ARG DEPENDENCY=target/dependency/borgbutler-server-0.6-SNAPSHOT


COPY ${DEPENDENCY}/lib /app/lib


#COPY ${DEPENDENCY}/META-INF /app/META-INF


#COPY ${DEPENDENCY}/BOOT-INF/classes /app




 borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/ArchivesRest.kt


@@ -150,7 +150,7 @@


                return RestUtils.notFound()


            }


            if (openDownloads == true) openFileBrowser(File(restoreDir, item.getPath()))


            return ResponseEntity.accepted().body("OK")


            return ResponseEntity.accepted().body("OK") // OK for download (see FileListEntry.jsx)


        } catch (ex: IOException) {


            log.error("No file extracted: " + ex.message, ex)


            return RestUtils.notFound()




 build.gradle


@@ -12,7 +12,7 @@




allprojects {


    group = 'de.micromata.borgbutler'


    version = '0.5'


    version = '0.6-SNAPSHOT'


}




subprojects {




 doc/images/screen-jobmonitor.png