Skip to content

Commit

Permalink
Merge pull request #152 from cpcwood/fixes
Browse files Browse the repository at this point in the history
Upate container image versions
  • Loading branch information
cpcwood authored Jun 9, 2023
2 parents 374f0e6 + 6379840 commit 44ef678
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ workflows:
jobs:
test:
docker:
- image: cimg/ruby:3.2.1-browsers
- image: cimg/ruby:3.2.2-browsers
- image: cimg/postgres:13.7
environment:
POSTGRES_USER: cpcwood-circleci
Expand Down
2 changes: 1 addition & 1 deletion .docker/dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Create App
# ================
FROM ruby:3.2.1-alpine3.17
FROM ruby:3.2.2-alpine3.17

ENV RAILS_ENV=production \
NODE_ENV=production \
Expand Down
2 changes: 1 addition & 1 deletion .docker/dockerfiles/base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Compile Assets
# ================

FROM ruby:3.2.1-alpine3.17
FROM ruby:3.2.2-alpine3.17

ENV RAILS_ENV=production \
NODE_ENV=production \
Expand Down
2 changes: 1 addition & 1 deletion .docker/dockerfiles/dev.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# home-server-dev-image
# ================

FROM ruby:3.2.1-alpine3.17
FROM ruby:3.2.2-alpine3.17

ENV RAILS_ENV=development \
NODE_ENV=development \
Expand Down
2 changes: 1 addition & 1 deletion .docker/dockerfiles/worker.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Create Worker App
# ================
FROM ruby:3.2.1-alpine3.17
FROM ruby:3.2.2-alpine3.17

ENV RAILS_ENV=production \
NODE_ENV=production \
Expand Down
9 changes: 3 additions & 6 deletions .docker/scripts/startup-app-dev
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@ fi

kill -INT "$(cat ./tmp/pids/server.pid 2>/dev/null)" >/dev/null 2>&1
rm -f ./tmp/pids/server.pid >/dev/null 2>&1
bundle exec rails tmp

if bundle exec rails db:exists ; then
bundle exec rails db:migrate
else
bundle exec rails db:create
bundle exec rails db:migrate
bundle exec rails db:seed
bundle exec rails db:setup
fi

bundle exec rails tmp

bundle exec rails server -b 0.0.0.0 -p 5000
bundle exec rails server -b 0.0.0.0 -p 5000
4 changes: 2 additions & 2 deletions .kube/app/home-server-redis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
spec:
containers:
- name: home-server-redis
image: redis:5-alpine
image: redis:6-alpine
command:
- redis-server
ports:
Expand All @@ -49,4 +49,4 @@ spec:
port: 6379
targetPort: 6379

---
---
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.1
3.2.2
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

ruby '3.2.1'
ruby '3.2.2'

# Rails
gem 'rails', '~> 7.0'
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ DEPENDENCIES
whenever (~> 1.0)

RUBY VERSION
ruby 3.2.1p31
ruby 3.2.2p53

BUNDLED WITH
2.3.26

0 comments on commit 44ef678

Please sign in to comment.