gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix docker shell environment

Browse source 
Move shared variables (nokogiri/path etc.) into the base image.

Fixes #2917
This commit is contained in:
Henne Vogelsang 2022-02-25 16:25:41 +01:00
parent f5c8055c9f
commit 6f3111c35d
No known key found for this signature in database
GPG key ID: 97DDB66BDAF8D4D6
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dockerfile
View file

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

14
Dockerfile.production
View file

@ -1,20 +1,22 @@
FROM registry.opensuse.org/opensuse/infrastructure/dale/containers/osem/base:latest FROM registry.opensuse.org/opensuse/infrastructure/dale/containers/osem/base:latest
# Install bundler & foreman ENV RAILS_ENV=production
RUN gem install bundler:1.17.3 foreman
# Add our files # Add our files
COPY --chown=1000:1000 . /osem/ 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 USER osem
WORKDIR /osem/ WORKDIR /osem/
# Install our bundle # 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 # Generate assets
RUN export RAILS_ENV=production; bundle exec rake assets:precompile RUN bundle exec rake assets:precompile
ENV RAILS_ENV=production
CMD ["foreman", "start"] CMD ["foreman", "start"]