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.

Sign up for GitHub

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

Use Docker volumes that really are shared #1588

Merged
merged 1 commit into from
Sep 14, 2023
Merged

Use Docker volumes that really are shared #1588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions app/controllers/templates_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def task_status

def populate_template
uploaded_file = params[:template_json_file]
dir = Rails.root.join('config', 'default_data', 'source_types')
dir = Seek::Config.append_filestore_path('source_types')

if Dir.exist?(dir)
`rm #{dir}/*`
Expand Down Expand Up @@ -146,11 +146,11 @@ def set_status
end

def lockfile
Rails.root.join('tmp', 'populate_templates.lock')
Rails.root.join(Seek::Config.temporary_filestore_path, 'populate_templates.lock')
end

def resultfile
Rails.root.join('tmp', 'populate_templates.result')
Rails.root.join(Seek::Config.temporary_filestore_path, 'populate_templates.result')
end

def running!
Expand Down
6 changes: 3 additions & 3 deletions lib/seek/isa_templates/template_extractor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def self.extract_templates
disable_authorization_checks do
client = Ebi::OlsClient.new
project = Project.find_or_create_by(title: 'Default Project')
directory = Rails.root.join('config', 'default_data', 'source_types')
directory = Seek::Config.append_filestore_path('source_types')
directory_files = Dir.exist?(directory) ? Dir.glob("#{directory}/*.json") : []
raise '<ul><li>Make sure to upload files that have the ".json" extension.</li></ul>' if directory_files == []

Expand Down Expand Up @@ -172,11 +172,11 @@ def self.seed_isa_tags
end

def self.lockfile
Rails.root.join('tmp', 'populate_templates.lock')
Rails.root.join(Seek::Config.temporary_filestore_path, 'populate_templates.lock')
end

def self.resultfile
Rails.root.join('tmp', 'populate_templates.result')
Rails.root.join(Seek::Config.temporary_filestore_path, 'populate_templates.result')
end
end
end
Expand Down
Loading