Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM ruby:2.4.2-slim-stretch

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Root Ruby version for Qless is 2.4.2. This only installs 3.1. Does Qless just not care what version was installed when starting up the container?

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

It is likely impossible to find a ruby container in 2.4.2 for a base image, short of making one from scratch. It's possible that it doesn't have any breaking changes that need addressing in 3.1?

FROM ruby:3.1-slim-bookworm

# Prevent docker's default encoding of ASCII.
# # https://oncletom.io/2015/docker-encoding/
ENV LANG C.UTF-8
ENV LANGUAGE en_US:C
ENV LC_ALL C.UTF-8
ENV LANG=C.UTF-8
ENV LANGUAGE=en_US:C
ENV LC_ALL=C.UTF-8

RUN apt-get update && \
apt-get install -y build-essential git curl redis-tools && \
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ gem 'rack'
# TODO: see why this isn't included in qless, though it is listed as a development dependency in
# https://github.com/seomoz/qless/blob/master/qless.gemspec
gem 'sinatra'
gem 'qless', git: 'https://github.com/seomoz/qless.git'
gem 'qless', '0.15.0', git: 'https://github.com/seomoz/qless.git', tag: 'v0.15.0'
64 changes: 33 additions & 31 deletions Gemfile.lock

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

rather than being deleted, should this be updated with the new required versions?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I deleted the Gemfile.lock because it was pinned to the old qless 0.11.0 and wouldn't work with v0.15.0. A fresh lock file gets generated automatically when Docker runs bundle install during the build.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

ok, so shouldn't that fresh lock file get checked in?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

good point, I'll extract the lock file from the build and commit it to the PR

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Double checking on this. You're saying that this Lock file is pulled from the built Docker image itself correct?

Original file line number Diff line number Diff line change
@@ -1,64 +1,66 @@
GIT
remote: https://github.com/seomoz/qless.git
revision: 9585ffd75d4fb9bda0a0275088c9f3c595328839
revision: 4a77d54fddb3a315c3da9f71f90b9915af3bf247
tag: v0.15.0
specs:
qless (0.11.0)
metriks (~> 0.9)
redis (>= 2.2, < 4.0.0.rc1)
qless (0.15.0)
redis (>= 2.2, < 5)
rusage (~> 0.2.0)
sentry-raven (~> 0.15.6)
sinatra (>= 1.3, < 2.1)
statsd-ruby (~> 1.3)
thin (~> 1.6)
thor (~> 0.19.1)
thor (~> 0.19)
vegas (~> 0.1.11)

GEM
remote: https://www.rubygems.org/
specs:
atomic (1.1.99)
avl_tree (1.2.1)
atomic (~> 1.1)
daemons (1.2.5)
eventmachine (1.2.5)
faraday (0.13.1)
multipart-post (>= 1.2, < 3)
hitimes (1.2.6)
metriks (0.9.9.8)
atomic (~> 1.0)
avl_tree (~> 1.2.0)
hitimes (~> 1.1)
multipart-post (2.0.0)
mustermann (1.0.1)
rack (2.0.3)
rack-protection (2.0.0)
daemons (1.4.1)
eventmachine (1.2.7)
faraday (2.14.1)
faraday-net_http (>= 2.0, < 3.5)
json
logger
faraday-net_http (3.4.2)
net-http (~> 0.5)
json (2.19.3)
logger (1.7.0)
mustermann (1.1.2)
ruby2_keywords (~> 0.0.1)
net-http (0.9.1)
uri (>= 0.11.1)
rack (2.2.22)
rack-protection (2.0.8.1)
rack
redis (3.3.5)
redis (4.8.1)
ruby2_keywords (0.0.5)
rusage (0.2.0)
sentry-raven (0.15.6)
faraday (>= 0.7.6)
sinatra (2.0.0)
sinatra (2.0.8.1)
mustermann (~> 1.0)
rack (~> 2.0)
rack-protection (= 2.0.0)
rack-protection (= 2.0.8.1)
tilt (~> 2.0)
statsd-ruby (1.4.0)
thin (1.7.2)
statsd-ruby (1.5.0)
thin (1.8.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (0.19.4)
tilt (2.0.8)
thor (0.20.3)
tilt (2.7.0)
uri (1.1.1)
vegas (0.1.11)
rack (>= 1.0.0)

PLATFORMS
ruby
aarch64-linux

DEPENDENCIES
qless!
qless (= 0.15.0)!
rack
sinatra

BUNDLED WITH
1.14.5
2.3.27