From a84c18669e18a2f81ae97d86c5338cca0441cfec Mon Sep 17 00:00:00 2001 From: Shana Moore Date: Thu, 23 May 2024 10:13:42 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=81=20This=20commit=20is=20required=20?= =?UTF-8?q?to=20resolve=20the=20issue=20with=20uploading=20images=20from?= =?UTF-8?q?=20the=20Collections'=20branding=20tab.=20Because=20the=20symli?= =?UTF-8?q?nk=20wasn't=20established,=20a=20user=20would=20not=20be=20able?= =?UTF-8?q?=20to=20see=20the=20images=20they=20uploaded=20even=20though=20?= =?UTF-8?q?the=20path=20correctly=20exists.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref: - https://github.com/scientist-softserv/atla-hyku/pull/187 --- Dockerfile | 5 +++++ ops/demo-deploy.tmpl.yaml | 3 +++ ops/staging-deploy.tmpl.yaml | 3 +++ 3 files changed, 11 insertions(+) diff --git a/Dockerfile b/Dockerfile index 325d61452..d3d21ea62 100644 --- a/Dockerfile +++ b/Dockerfile @@ -83,6 +83,11 @@ RUN ln -sf /usr/lib/libmediainfo.so.0 /app/fits/tools/mediainfo/linux/libmediain COPY --chown=1001:101 ./bin/db-migrate-seed.sh /app/samvera/ +# Ensure the directory exists and create the symbolic link +RUN mkdir -p /app/samvera/hyrax-webapp/public/branding && \ + mkdir -p /app/samvera/branding && \ + ln -sf /app/samvera/branding /app/samvera/hyrax-webapp/public/branding + ONBUILD ARG APP_PATH=. ONBUILD COPY --chown=1001:101 $APP_PATH/Gemfile* /app/samvera/hyrax-webapp/ ONBUILD RUN git config --global --add safe.directory /app/samvera && \ diff --git a/ops/demo-deploy.tmpl.yaml b/ops/demo-deploy.tmpl.yaml index ce5ac3288..c6f7b2e95 100644 --- a/ops/demo-deploy.tmpl.yaml +++ b/ops/demo-deploy.tmpl.yaml @@ -35,6 +35,9 @@ extraVolumeMounts: &volMounts - name: uploads mountPath: /app/samvera/hyrax-webapp/storage/files subPath: storage-files + - name: uploads + mountPath: /app/samvera/hyrax-webapp/public/branding + subPath: branding ingress: enabled: true diff --git a/ops/staging-deploy.tmpl.yaml b/ops/staging-deploy.tmpl.yaml index e2ec85915..388bb215a 100644 --- a/ops/staging-deploy.tmpl.yaml +++ b/ops/staging-deploy.tmpl.yaml @@ -35,6 +35,9 @@ extraVolumeMounts: &volMounts - name: uploads mountPath: /app/samvera/hyrax-webapp/storage/files subPath: storage-files + - name: uploads + mountPath: /app/samvera/hyrax-webapp/public/branding + subPath: branding ingress: enabled: true