Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix for public file export path #338

Merged
merged 4 commits into from
Aug 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -419,8 +419,8 @@ drupal-public-files-dump:
ifndef DEST
$(error DEST is not set)
endif
docker compose exec -T drupal with-contenv bash -lc 'tar zcvf /tmp/public-files.tgz /var/www/drupal/web/sites/default/files'
docker cp $$(docker compose ps -q drupal):/tmp/public-files.tgz $(DEST)
docker compose exec -T drupal with-contenv bash -lc 'tar zcvf /tmp/public-files.tgz -C /var/www/drupal/web/sites/default/files ${PUBLIC_FILES_TAR_DUMP_PATH}'
docker cp $$(docker-compose ps -q drupal):/tmp/public-files.tgz $(DEST)


# import Drupal's public files from zipped tarball
Expand Down
6 changes: 6 additions & 0 deletions sample.env
Original file line number Diff line number Diff line change
Expand Up @@ -197,3 +197,9 @@ WATCHTOWER_MEMORY_LIMIT=2G
CANTALOUPE_DELEGATE_SCRIPT_ENABLED=false
CANTALOUPE_DELEGATE_SCRIPT_PATHNAME=/opt/tomcat/bin/delegates.rb
CANTALOUPE_HTTPSOURCE_LOOKUP_STRATEGY=BasicLookupStrategy

# Path to include in tar file for exported public files
# If set to . the files will be exported wherever you specify as DEST
# when running make drupal-public-files-import
# If set to anything else, that path will be added to DEST
PUBLIC_FILES_TAR_DUMP_PATH=.