Merge pull request #1682 from hennevogel/feature/docker-base

Move image building to OBS

Dockerfile

@@ -1,32 +1,9 @@
-FROM registry.opensuse.org/opensuse/leap:15.4
+FROM registry.opensuse.org/opensuse/infrastructure/dale/containers/hackweek/base:latest
 ARG CONTAINER_USERID=1000
 
-# Add needed repos
-RUN echo 'solver.allowVendorChange = true' >> /etc/zypp/zypp.conf; \
-    zypper ar -f https://download.opensuse.org/repositories/openSUSE:/infrastructure:/dale/15.4/openSUSE:infrastructure:dale.repo; \
-    zypper ar -f https://download.opensuse.org/repositories/devel:/languages:/ruby/15.4/devel:languages:ruby.repo; \
-    zypper --gpg-auto-import-keys refresh
-
-# Install requirements
-RUN zypper -n install --no-recommends --replacefiles \
-  curl vim vim-data psmisc timezone ack glibc-locale sudo hostname \
-  sphinx libxml2-devel libxslt-devel libffi-devel sqlite3-devel nodejs8 gcc-c++ \
-  ImageMagick libmariadb-devel ruby3.1-devel make git-core mariadb-client \
-  chromium xorg-x11-fonts; \
-  zypper -n clean --all
-
-# Add our user
-RUN useradd -m hackweek
-
 # Configure our user
 RUN usermod -u $CONTAINER_USERID hackweek
 
-# Setup sudo
-RUN echo 'hackweek ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
-
-# Disable versioned gem binary names
-RUN echo 'install: --no-format-executable' >> /etc/gemrc
-
 # We copy the Gemfiles into this intermediate build stage so it's checksum
 # changes and all the subsequent stages (a.k.a. the bundle install call below)
 # have to be rebuild. Otherwise, after the first build of this image,
@@ -35,32 +12,12 @@ ADD Gemfile /hackweek/Gemfile
 ADD Gemfile.lock /hackweek/Gemfile.lock
 RUN chown -R hackweek /hackweek
 
-# Install bundler
-RUN gem.ruby3.1 install bundler -v "$(grep -A 1 "BUNDLED WITH" /hackweek/Gemfile.lock | tail -n 1)"; \
-    gem.ruby3.1 install foreman
-
-# Setup Ruby 3.1 as default
-RUN ln -sf /usr/bin/ruby.ruby3.1 /home/hackweek/bin/ruby; \
-    ln -sf /usr/bin/gem.ruby3.1 /home/hackweek/bin/gem; \
-    ln -sf /usr/bin/bundle.ruby3.1 /home/hackweek/bin/bundle; \
-    ln -sf /usr/bin/rake.ruby3.1 /home/hackweek/bin/rake;
-ENV PATH /home/hackweek/bin:$PATH
-
 WORKDIR /hackweek
 USER hackweek
 
-# Setup shell history
-ADD --chown=hackweek:users .irbrc /home/hackweek/.irbrc
-RUN ln -sf /hackweek/tmp/.bash_history /home/hackweek/.bash_history; \
-    ln -sf /hackweek/tmp/.irb_history /home/hackweek/.irb_history;
-
-# Configure our bundle
-RUN bundle config build.ffi --enable-system-libffi; \
-    bundle config build.nokogiri --use-system-libraries; \
-    bundle config build.sassc --disable-march-tune-native;
-
-# Install our bundle
-RUN bundle install --jobs=3 --retry=3
+# Install our bundle & process manager
+RUN bundle install --jobs=3 --retry=3; \
+    gem install foreman
 
 # Run our command
 CMD ["foreman", "start", "-f", "Procfile"]

Gemfile.lock

@@ -445,4 +445,4 @@ DEPENDENCIES
   webdrivers
 
 BUNDLED WITH
-   2.3.3
+   2.5.16