Skip to content
This repository has been archived by the owner on Jun 13, 2023. It is now read-only.

Commit

Permalink
Fix docker support (#258)
Browse files Browse the repository at this point in the history
Docker image was failing to build. Base image and some dependency versions needed to be pinned.

* Rollback base Alpine linux image to v3.11.
* Explicitly install Rails v5.2.6.
* Copy Gemfile and warclight.gemspec files to working directory before installing Rails and warclight.
  • Loading branch information
obrienben authored Feb 28, 2022
1 parent 468af36 commit 902c9b7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ARG ALPINE_RUBY_VERSION=3.14
ARG ALPINE_RUBY_VERSION=3.11
ARG RAILS_VERSION=5.2.6

FROM ruby:alpine${ALPINE_RUBY_VERSION}

Expand All @@ -21,9 +22,9 @@ RUN gem update --system && \
gem install bundler && \
bundle config build.nokogiri --use-system-libraries

RUN gem install rails
COPY Gemfile warclight.gemspec template.rb ./

COPY template.rb .
RUN gem install rails --version 5.2.6

RUN rails new warclight -m template.rb

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ services:
context: .
dockerfile: Dockerfile
args:
- ALPINE_RUBY_VERSION=3.14
- ALPINE_RUBY_VERSION=3.11
depends_on:
- solr
ports:
- "3000:3000"
environment:
- SOLR_URL='http://solr:8983/solr/discovery'
- RAILS_VERSION= 5.2.4.1
- RAILS_VERSION=5.2.6

solr:
image: ukwa/webarchive-discovery-solr
Expand Down

0 comments on commit 902c9b7

Please sign in to comment.