Merge pull request #2943 from hennevogel/bugfix/docker-shell-env

Fix docker shell environment
This commit is contained in:
Henne Vogelsang 2022-03-01 15:50:43 +01:00 committed by GitHub
commit b74730d76d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions

View file

@ -1,6 +1,5 @@
FROM registry.opensuse.org/opensuse/infrastructure/dale/containers/osem/base:latest
ARG CONTAINER_USERID
ENV NOKOGIRI_USE_SYSTEM_LIBRARIES=1
# Configure our user
RUN usermod -u $CONTAINER_USERID osem
@ -14,8 +13,8 @@ COPY Gemfile.lock /osem/
RUN chown -R osem /osem
# Install bundler & foreman
RUN gem.ruby3.1 install bundler -v "$(grep -A 1 "BUNDLED WITH" /osem/Gemfile.lock | tail -n 1)"; \
gem.ruby3.1 install foreman
RUN gem install bundler -v "$(grep -A 1 "BUNDLED WITH" /osem/Gemfile.lock | tail -n 1)"; \
gem install foreman
# Continue as user
USER osem

View file

@ -1,20 +1,22 @@
FROM registry.opensuse.org/opensuse/infrastructure/dale/containers/osem/base:latest
# Install bundler & foreman
RUN gem install bundler:1.17.3 foreman
ENV RAILS_ENV=production
# Add our files
COPY --chown=1000:1000 . /osem/
# Install bundler & foreman
RUN gem install bundler -v "$(grep -A 1 "BUNDLED WITH" /osem/Gemfile.lock | tail -n 1)"; \
gem install foreman
USER osem
WORKDIR /osem/
# Install our bundle
RUN export NOKOGIRI_USE_SYSTEM_LIBRARIES=1; bundle install --jobs=3 --retry=3 --without test development
RUN bundle config set --local without 'test development'
RUN bundle install --jobs=3 --retry=3
# Generate assets
RUN export RAILS_ENV=production; bundle exec rake assets:precompile
ENV RAILS_ENV=production
RUN bundle exec rake assets:precompile
CMD ["foreman", "start"]