Skip to content

Commit

Permalink
updated to ruby 2.4 and sinatra 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
abuisine committed May 16, 2017
1 parent 07cacd8 commit 73475d8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 13 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ruby:2.3
FROM ruby:2.4

MAINTAINER Alexandre Buisine <[email protected]>
LABEL version="2.2.0"
LABEL maintainer="Alexandre Buisine <[email protected]>"
LABEL version="2.4.0"

ENV BASE_URL="/resque_web"

Expand All @@ -16,7 +16,7 @@ RUN gem install rails --no-ri --no-rdoc \
&& cd / \
&& rails new resque-scheduler-web \
&& cd resque-scheduler-web \
&& echo "gem 'sinatra', '2.0.0.beta2'" >> Gemfile \
&& echo "gem 'sinatra'" >> Gemfile \
&& echo "gem 'resque'" >> Gemfile \
&& echo "gem 'resque-scheduler'" >> Gemfile \
&& echo "gem 'resque-web', require: 'resque_web'" >> Gemfile \
Expand Down
13 changes: 5 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This container is compatible with `resque-scheduler`.
The container is based on `ruby:2.3` and sinatra 2.

## DISCLAIMER
Uses Sinatra `2.0.0.beta2`.
Uses Sinatra `2.0.0`.
Available versions of this container are quite big (to be solved in next versions).

## NOTICE
Expand All @@ -16,16 +16,13 @@ Note that the sinatra web interface will be gone in Resque 2.0 and this is meant
Resque (pronounced like "rescue") is a Redis-backed library for creating background jobs, placing those jobs on multiple queues, and processing them later.

## About Resque-Web
A Rails-based frontend to the [Resque](https://github.com/resque/resque) job
queue system. This provides a similar interface to the existing Sinatra
application that comes bundled with Resque, but deploys like a Rails application
and leverages Rails conventions for factoring things like controllers, helpers,
and views.
A Rails-based frontend to the [Resque](https://github.com/resque/resque) job queue system.
This provides a similar interface to the existing Sinatra application that comes bundled with Resque, but deploys like a Rails application and leverages Rails conventions for factoring things like controllers, helpers, and views.

## About Resque-Scheduler-Web
Provides tabs in Resque Web for managing Resque Scheduler.
It works with any version of Resque and Resque Scheduler.
This gem is a port of the old Sinatra code to the new REsque Web plugin architecture and has better test coverage and a number of bug fixes compared to the older Resque Scheduler Sinatra code which it is based on.
This gem is a port of the old Sinatra code to the new Resque Web plugin architecture and has better test coverage and a number of bug fixes compared to the older Resque Scheduler Sinatra code which it is based on.

# Configuration

Expand All @@ -35,4 +32,4 @@ If you need a non-default resque server, use this environment variable:
RAILS_RESQUE_REDIS=<host>:<port>:<database>
```

This container is configured to serve Resque-Web on the `/resque-web` path which allows simple reverse proxy configuration.
This container is configured to serve Resque-Web on the `/resque_web` path which allows simple reverse proxy configuration.
2 changes: 1 addition & 1 deletion test/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
restart: always

resque-web:
image: abuisine/resque-web:2.2.0
image: abuisine/resque-web:2.4.0
depends_on:
- redis
ports:
Expand Down

0 comments on commit 73475d8

Please sign in to comment.