Skip to content

Commit

Permalink
🐛 move symlink from dockerfile to later in the process
Browse files Browse the repository at this point in the history
Knapsacks' branding uploads are still not displaying the files because the directories aren't symlinked. We suspect there may be a layering issue when putting it in the Dockerfile. We are moving this bit of code to happen later in the process.
  • Loading branch information
Shana Moore committed Jun 12, 2024
1 parent c02b636 commit d80b284
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
5 changes: 0 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,6 @@ 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 && \
mkdir -p /app/samvera/branding && \
ln -snf /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 && \
Expand Down
5 changes: 5 additions & 0 deletions bin/web
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,9 @@
# frozen_string_literal: true
`echo "$GOOGLE_OAUTH_PRIVATE_KEY_VALUE" | base64 -d > prod-cred.p12` unless ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].to_s.strip.empty?

# Ensure the directory exists and create the symbolic link
RUN mkdir -p /app/samvera/hyrax-webapp/public && \
mkdir -p /app/samvera/branding && \
ln -snf /app/samvera/branding /app/samvera/hyrax-webapp/public/branding

exec "bundle exec puma -v -b tcp://0.0.0.0:3000"

0 comments on commit d80b284

Please sign in to comment.