Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade gemstash to v2.0.0 #5

Merged
merged 6 commits into from
Apr 30, 2019
Merged
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## 1.2.0

* Upgrade Ruby to v2.6.3.
* Upgrade Gemstash to v2.0.0.

## 1.1.0

### 2018-02-23
Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @itskingori @tsu-shiuan @zacblazic
* @Intellection/devops
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.5.0-alpine
FROM ruby:2.6.3-alpine

# Install system dependencies
RUN apk --update add \
Expand All @@ -22,8 +22,7 @@ RUN addgroup -g "9999" "${GEMSTASH_USER}" && \
RUN mkdir -p "${GEMSTASH_HOME}/app"
WORKDIR "${GEMSTASH_HOME}/app"
COPY "app/" "${GEMSTASH_HOME}/app"
RUN bundle config disable_checksum_validation true && \
bundle install --jobs 4 --retry 3
RUN bundle install --jobs 4 --retry 3

VOLUME "${GEMSTASH_HOME}/data"

Expand Down
34 changes: 17 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,39 +18,39 @@ $ docker run \

See `docker-compose.sqlite.yml` for an example of how to use SQLite. To run:

```
$ docker-compose -f docker-compose.sqlite.yml ps
Name Command State Ports
-------------------------------------------------------------------------------------------
dockergemstash_gemstash_1 /entrypoint.sh bundle exec ... Up 0.0.0.0:9292->9292/tcp
```console
$ export COMPOSE_FILE="docker-compose.sqlite.yml"
$ docker-compose up -d
$ docker-compose ps
Name Command State Ports
--------------------------------------------------------------------------------------------
docker-gemstash_gemstash_1 /entrypoint.sh bundle exec ... Up 0.0.0.0:9292->9292/tcp
```

#### MySQL

See `docker-compose.mysql.yml` for an example of how to use MySQL. To run:

```
```console
$ export COMPOSE_FILE="docker-compose.mysql.yml"
$ docker-compose up -d

$ docker-compose ps
Name Command State Ports
-------------------------------------------------------------------------------------------
dockergemstash_gemstash_1 /entrypoint.sh gemstash st ... Up 0.0.0.0:9292->9292/tcp
dockergemstash_mysql_1 docker-entrypoint.sh mysqld Up 3306/tcp
Name Command State Ports
---------------------------------------------------------------------------------------------------
docker-gemstash_gemstash_1 /entrypoint.sh bundle exec ... Up 0.0.0.0:9292->9292/tcp
docker-gemstash_mysql_1 docker-entrypoint.sh mysqld Up (healthy) 3306/tcp
```

#### PostgreSQL

See `docker-compose.postgres.yml` for an example of how to use PostgreSQL. To run:

```
```console
$ export COMPOSE_FILE="docker-compose.postgres.yml"
$ docker-compose up -d

$ docker-compose ps
Name Command State Ports
-------------------------------------------------------------------------------------------
dockergemstash_gemstash_1 /entrypoint.sh gemstash st ... Up 0.0.0.0:9292->9292/tcp
dockergemstash_postgres_1 docker-entrypoint.sh postgres Up 5432/tcp
Name Command State Ports
--------------------------------------------------------------------------------------------
docker-gemstash_gemstash_1 /entrypoint.sh bundle exec ... Up 0.0.0.0:9292->9292/tcp
docker-gemstash_postgres_1 docker-entrypoint.sh postgres Up 5432/tcp
```
1 change: 1 addition & 0 deletions app/.ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.3
8 changes: 4 additions & 4 deletions app/Gemfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
source 'https://rubygems.org'

ruby '2.5.0'
ruby '2.6.3'

# A simple, fast Mysql library for Ruby, binding to libmysql.
gem 'mysql2', '~> 0.4.8'
gem 'mysql2', '~> 0.5.2'

# Pg is the Ruby interface to the PostgreSQL.
gem 'pg', '~> 0.21.0'
gem 'pg', '~> 0.18.4'

# Gemstash acts as a local RubyGems server, caching copies of gems from
# RubyGems.org automatically, and eventually letting you push your own private
# gems as well.
gem 'gemstash', '1.1.0'
gem 'gemstash', '~> 2.0'
67 changes: 35 additions & 32 deletions app/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,64 +1,67 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (5.1.2)
activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
concurrent-ruby (1.0.5)
dalli (2.7.6)
faraday (0.12.2)
concurrent-ruby (1.1.5)
dalli (2.7.10)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.12.1)
faraday_middleware (0.13.1)
faraday (>= 0.7.4, < 1.0)
gemstash (1.1.0)
gemstash (2.0.0)
activesupport (>= 4.2, < 6)
dalli (~> 2.7)
faraday (~> 0.9)
faraday_middleware (~> 0.10)
lru_redux (~> 1.1)
puma (~> 2.14)
sequel (~> 4.26)
puma (~> 3.10)
sequel (~> 5.0)
server_health_check-rack (~> 0.1)
sinatra (~> 1.4)
sinatra (>= 1.4, < 3.0)
sqlite3 (~> 1.3)
thor (~> 0.19)
i18n (0.8.6)
thor (~> 0.20)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
lru_redux (1.1.0)
minitest (5.10.3)
minitest (5.11.3)
multipart-post (2.0.0)
mysql2 (0.4.8)
pg (0.21.0)
puma (2.16.0)
rack (1.6.8)
rack-protection (1.5.3)
mustermann (1.0.3)
mysql2 (0.5.2)
pg (0.18.4)
puma (3.12.1)
rack (2.0.7)
rack-protection (2.0.5)
rack
sequel (4.49.0)
sequel (5.19.0)
server_health_check (1.0.2)
server_health_check-rack (0.1.0)
server_health_check (~> 1.0, >= 1.0.1)
sinatra (1.4.8)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
sqlite3 (1.3.13)
thor (0.19.4)
sinatra (2.0.5)
mustermann (~> 1.0)
rack (~> 2.0)
rack-protection (= 2.0.5)
tilt (~> 2.0)
sqlite3 (1.4.1)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.8)
tzinfo (1.2.3)
tilt (2.0.9)
tzinfo (1.2.5)
thread_safe (~> 0.1)

PLATFORMS
ruby

DEPENDENCIES
gemstash (= 1.1.0)
mysql2 (~> 0.4.8)
pg (~> 0.21.0)
gemstash (~> 2.0)
mysql2 (~> 0.5.2)
pg (~> 0.18.4)

RUBY VERSION
ruby 2.5.0p0
ruby 2.6.3p62

BUNDLED WITH
1.16.1
1.17.2
2 changes: 1 addition & 1 deletion docker-compose.mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: '2.1'
services:
gemstash:
image: zappi/gemstash:1.1.0
image: zappi/gemstash:1.2.0
environment:
RACK_ENV: production
GEMSTASH_DB_ADAPTER: mysql2
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: '2.1'
services:
gemstash:
image: zappi/gemstash:1.1.0
image: zappi/gemstash:1.2.0
environment:
RACK_ENV: production
GEMSTASH_DB_ADAPTER: postgres
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
build:
context: .
dockerfile: Dockerfile
image: zappi/gemstash:1.1.0
image: zappi/gemstash:1.2.0
environment:
RACK_ENV: production
ports:
Expand Down