From 2c0040d816c20a48cd8192deeea619af12235f99 Mon Sep 17 00:00:00 2001 From: Greg Kostin Date: Wed, 9 Oct 2024 16:31:35 -0400 Subject: [PATCH] Fix legacy key value format in dockerfiles --- .docker/Dockerfile.unstable | 4 ++-- .docker/branch.dockerfile | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.docker/Dockerfile.unstable b/.docker/Dockerfile.unstable index 1ce120f3..a0f4e7b4 100644 --- a/.docker/Dockerfile.unstable +++ b/.docker/Dockerfile.unstable @@ -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 - @@ -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' diff --git a/.docker/branch.dockerfile b/.docker/branch.dockerfile index a73c9b46..205d327b 100644 --- a/.docker/branch.dockerfile +++ b/.docker/branch.dockerfile @@ -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 - @@ -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 @@ -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"]