diff --git a/docker/app/run-development b/docker/app/run-development index 4e03fab9..bc209c9a 100755 --- a/docker/app/run-development +++ b/docker/app/run-development @@ -43,6 +43,11 @@ until wget -qO - elasticsearch:9200; do sleep 2 done +until wget -qO - files/philomena; do + echo -n "." + sleep 2 +done + echo # Try to create the database if it doesn't exist yet diff --git a/lib/philomena/images.ex b/lib/philomena/images.ex index a244f280..7ecaf8ff 100644 --- a/lib/philomena/images.ex +++ b/lib/philomena/images.ex @@ -109,7 +109,6 @@ defmodule Philomena.Images do |> case do {:ok, %{image: image}} = result -> Uploader.persist_upload(image) - Uploader.unpersist_old_upload(image) repair_image(image) reindex_image(image) @@ -195,7 +194,6 @@ defmodule Philomena.Images do |> Repo.update() |> case do {:ok, image} -> - Uploader.unpersist_old_upload(image) purge_files(image, image.hidden_image_key) Thumbnailer.destroy_thumbnails(image) @@ -262,7 +260,6 @@ defmodule Philomena.Images do |> case do {:ok, image} -> Uploader.persist_upload(image) - Uploader.unpersist_old_upload(image) repair_image(image) purge_files(image, image.hidden_image_key) diff --git a/lib/philomena/images/uploader.ex b/lib/philomena/images/uploader.ex index 8419b805..39111e11 100644 --- a/lib/philomena/images/uploader.ex +++ b/lib/philomena/images/uploader.ex @@ -14,8 +14,4 @@ defmodule Philomena.Images.Uploader do def persist_upload(image) do Thumbnailer.upload_file(image, image.uploaded_image, "full.#{image.image_format}") end - - def unpersist_old_upload(image) do - Thumbnailer.destroy_thumbnails(image) - end end