Skip to content

Commit

Permalink
Merge pull request #138 from mlibrary/LegacyKeyValueFormat
Browse files Browse the repository at this point in the history
Fix legacy key value format in dockerfiles
  • Loading branch information
gkostin1966 authored Oct 17, 2024
2 parents b65a2fd + 2c0040d commit 5f0e65b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .docker/Dockerfile.unstable
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG UNAME=app-user
ARG UID=1000
ARG GID=1000

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN curl https://deb.nodesource.com/setup_12.x | bash
RUN curl https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
Expand All @@ -28,7 +28,7 @@ ENV LD_PRELOAD=libjemalloc.so.2
USER $UNAME
COPY --chown=$UID:$GID Gemfile* /opt/app-root/

ENV BUNDLE_PATH /gems
ENV BUNDLE_PATH=/gems

WORKDIR /opt/app-root
RUN gem install 'bundler:~>2.2.21'
Expand Down
12 changes: 6 additions & 6 deletions .docker/branch.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG UNAME=app
ARG UID=1000
ARG GID=1000

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN curl https://deb.nodesource.com/setup_12.x | bash
RUN curl https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
Expand All @@ -19,17 +19,17 @@ RUN apt-get update -yqq && \
RUN wget -q https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.bullseye_amd64.deb
RUN apt-get install -yqq --no-install-recommends ./wkhtmltox_0.12.6.1-2.bullseye_amd64.deb

ENV APP_PATH /opt/app
ENV APP_PATH=/opt/app
RUN groupadd -g $GID -o $UNAME
RUN useradd -m -d $APP_PATH -u $UID -g $GID -o -s /bin/bash $UNAME

ENV DATA_PATH /var/opt/app
ENV DATA_PATH=/var/opt/app
RUN mkdir -p $DATA_PATH && chown $UID:$GID $DATA_PATH

ENV BUNDLE_PATH /var/opt/app/gems
ENV BUNDLE_PATH=/var/opt/app/gems
RUN mkdir -p $BUNDLE_PATH && chown $UID:$GID $BUNDLE_PATH

ENV FINDING_AID_DATA /var/opt/app/data
ENV FINDING_AID_DATA=/var/opt/app/data
RUN mkdir -p $FINDING_AID_DATA && chown $UID:$GID $FINDING_AID_DATA

COPY --chown=$UID:$GID . $APP_PATH
Expand All @@ -44,7 +44,7 @@ RUN bundle config --local build.sassc --disable-march-tune-native
RUN bundle install
RUN yarn install

ENV RAILS_ENV production
ENV RAILS_ENV=production
RUN bundle exec rails assets:precompile

CMD ["bundle", "exec", "bin/rails", "s", "-b", "0.0.0.0"]

0 comments on commit 5f0e65b

Please sign in to comment.