diff --git a/.gitattributes b/.gitattributes index 348e18e..6893fba 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ *.zip filter=lfs diff=lfs merge=lfs -text *.blob filter=lfs diff=lfs merge=lfs -text +*.tar filter=lfs diff=lfs merge=lfs -text diff --git a/demo/containers/dbsdata/README.org b/demo/containers/dbsdata/README.org index 8c8dfb1..6a843cc 100644 --- a/demo/containers/dbsdata/README.org +++ b/demo/containers/dbsdata/README.org @@ -38,12 +38,19 @@ # Persist volume using container cd ~/work-gh/mrva/mrvacommander/demo/containers/dbsdata - # Note: use mrvacommander_dbsdata, not mrvacommander-dbsdata - # Get the data as tar file from the image + # Use mrvacommander_dbsdata to access the compose cluster + # EITHER + # Get the data as tar file from the image using container + rm -f dbsdata_backup.tar docker run --rm \ -v mrvacommander_dbsdata:/data \ -v $(pwd):/backup \ - busybox sh -c "tar cvf /backup/dbsdata_backup.tar ." + busybox sh -c "tar cf /backup/dbsdata_backup.tar /data" + # OR + # Use gnu tar on host. The macos tar adds extended attributes + # brew install gnu-tar + rm -f dbsdata_backup.tar && gtar cf dbsdata_backup.tar data/ + # Build container with the tarball cd ~/work-gh/mrva/mrvacommander/demo/containers/dbsdata docker build -t dbsdata-container:0.1.24 . diff --git a/demo/containers/dbsdata/dbsdata_backup.tar b/demo/containers/dbsdata/dbsdata_backup.tar new file mode 100644 index 0000000..8ac72b0 --- /dev/null +++ b/demo/containers/dbsdata/dbsdata_backup.tar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93fad7e0576f2a39edd9327b9b77dfca172a013557495b17f37467a2f5a5dae4 +size 292883456 diff --git a/docker-compose-demo-build.yml b/docker-compose-demo-build.yml index 14be645..98834d8 100644 --- a/docker-compose-demo-build.yml +++ b/docker-compose-demo-build.yml @@ -4,8 +4,8 @@ services: dbssvc: ## image: ghcr.io/hohn/dbsdata-container:0.1.24 build: - context: . - dockerfile: ./demo/containers/dbsdata/Dockerfile + context: ./demo/containers/dbsdata + dockerfile: Dockerfile container_name: dbssvc volumes: - dbsdata:/data/mrvacommander/dbstore-data