Merge pull request #318 from WadeBarnes/main

Add support for restoring archives in xz format.
bcgov · Aug 28, 2024 · e32d173 · e32d173
2 parents 2b59570 + efc5741
commit e32d173
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,16 @@
 FROM bcgovimages/von-image:node-1.12-6
+ARG user=indy
 ARG LOG_LEVEL=info
 ARG RUST_LOG=warning
 ENV LOG_LEVEL=$LOG_LEVEL
 ENV RUST_LOG=$RUST_LOG
 
+USER root
+RUN apt-get update -y && \
+    apt-get install -y \
+    xz-utils
+USER $user
+
 ADD config ./config
 ADD server/requirements.txt server/
 

diff --git a/manage b/manage
@@ -731,7 +731,7 @@ function restoreArchive()
         --user root \
         -v ${archiveVolumeMount}:/${ROOT_BACKUP_DIR} \
         -v ${volume}:/target_volume von-network-base \
-        tar --same-owner -xzvpf ${archiveToRestore} -C /target_volume/ ${tarOptions}
+        tar --same-owner -xvpf ${archiveToRestore} -C /target_volume/ ${tarOptions}
     else
       echo -e \\n"Restore aborted."
     fi