Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,26 +1,20 @@
FROM opensuse/leap:15.6
FROM registry.opensuse.org/opensuse/leap:16.0

RUN zypper --non-interactive install --no-recommends \
timezone wget gcc-c++ libffi-devel git-core zlib-devel \
libxml2-devel libxslt-devel cron libmariadb-devel mariadb-client sqlite3-devel \
vim ruby2.5 ruby2.5-devel ruby2.5-rubygem-bundler SUSEConnect jq bzip2 gzip && \
zypper --non-interactive install -t pattern devel_basis && \
update-alternatives --install /usr/bin/bundle bundle /usr/bin/bundle.ruby2.5 5 && \
update-alternatives --install /usr/bin/bundler bundler /usr/bin/bundler.ruby2.5 5
RUN zypper --non-interactive install --no-recommends ruby3.4 ruby3.4-devel

RUN zypper --non-interactive install libffi-devel libmysqlclient-devel libxml2-devel \
libxslt-devel rpmbuild systemd gzip tar bzip2 nodejs sqlite-devel \
make chrpath fdupes gcc libcurl-devel libyaml-devel

WORKDIR /srv/www/rmt/

COPY Gemfile* /srv/www/rmt/

RUN bundle.ruby2.5 config build.nokogiri --use-system-libraries && \
bundle install
RUN bundle install

COPY . /srv/www/rmt/

RUN mkdir /srv/www/rmt/public/repo

RUN sed -i 's/#!\/usr\/bin\/env ruby/#!\/usr\/bin\/ruby.ruby2.5/g' /srv/www/rmt/bin/rmt-cli && \
ln -s /srv/www/rmt/bin/rmt-cli /usr/bin && \
RUN ln -s /srv/www/rmt/bin/rmt-cli /usr/bin && \
mkdir /var/lib/rmt/ && \
groupadd -r nginx && \
useradd -g nginx -s /bin/false -r -c "user for RMT" _rmt && \
Expand Down
15 changes: 0 additions & 15 deletions ci/Dockerfile
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file should not be deleted as rmt 2 ci depends on it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a different branch

This file was deleted.

4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
db:
image: registry.suse.com/suse/mariadb:10.11
image: registry.suse.com/suse/mariadb:11.8
restart: unless-stopped
volumes:
- mariadb:/var/lib/mysql
Expand All @@ -19,7 +19,7 @@ services:
command: bundle exec rails runner /srv/www/rmt/bin/compose-init.rb

nginx:
image: nginx:1.14
image: nginx:1.27.2
volumes:
- ./public:/var/www/
- ./nginx/default.conf:/tmp/default.template
Expand Down
Loading