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

Bump rails-html-sanitizer from 1.3.0 to 1.4.4 #20

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
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
14 changes: 1 addition & 13 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,4 @@ RUN bundle install
COPY . /usr/src/app

EXPOSE 3000

# install s6overlay so that we can run cron inside this container as well.
ADD https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-amd64.tar.gz /tmp/
RUN tar xzf /tmp/s6-overlay-amd64.tar.gz -C / \
&& mkdir /config \
&& apt-get update \
&& apt-get install -y cron \
&& rm -rf /var/lib/apt/lists/*

COPY rootfs/ /
VOLUME ["/config"]

ENTRYPOINT ["/init"]
CMD ["./entrypoint.sh"]
22 changes: 11 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ GEM
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
addressable (2.7.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
aws-eventstream (1.1.1)
aws-partitions (1.444.0)
Expand Down Expand Up @@ -151,7 +151,7 @@ GEM
listen (3.5.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.9.1)
loofah (2.19.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.2.8)
Expand All @@ -163,7 +163,7 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0225)
mini_mime (1.1.0)
mini_portile2 (2.5.0)
mini_portile2 (2.8.0)
mini_racer (0.4.0)
libv8-node (~> 15.14.0.0)
minitest (5.14.4)
Expand All @@ -172,9 +172,9 @@ GEM
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
nenv (0.3.0)
nio4r (2.5.7)
nokogiri (1.11.3)
mini_portile2 (~> 2.5.0)
nio4r (2.5.8)
nokogiri (1.13.10)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
notiffany (0.1.3)
nenv (~> 0.1)
Expand All @@ -191,9 +191,9 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.6)
puma (4.3.7)
puma (4.3.9)
nio4r (~> 2.0)
racc (1.5.2)
racc (1.6.1)
rack (2.2.3)
rack-cache (1.12.1)
rack (>= 0.4)
Expand Down Expand Up @@ -223,8 +223,8 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails-html-sanitizer (1.4.4)
loofah (~> 2.19, >= 2.19.1)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
Expand All @@ -240,7 +240,7 @@ GEM
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (6.3.0)
rdoc (6.3.2)
rexml (3.2.5)
rspec (3.10.0)
rspec-core (~> 3.10.0)
Expand Down
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
GCLOUD_PROJECT:=$(shell gcloud config list project --format="value(core.project)")
PROJECT_NAME:=klaxon

build:
docker build -t us.gcr.io/$(GCLOUD_PROJECT)/$(PROJECT_NAME) .

push: build
docker push us.gcr.io/$(GCLOUD_PROJECT)/$(PROJECT_NAME)
6 changes: 5 additions & 1 deletion config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,8 @@ test:

production:
<<: *default
url: <%= ENV['DATABASE_URL'] %>
database: <%= ENV.fetch('DB_NAME') %>
username: <%= ENV.fetch('DB_USER') %>
password: <%= ENV.fetch('DB_PASSWORD') %>
host: <%= ENV.fetch('DB_HOST', 'localhost') %>
port: 5432
7 changes: 7 additions & 0 deletions entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/sh

# Precompile files
bundle exec rake assets:precompile

# Run the server
bundle exec puma -C config/puma.rb
4 changes: 0 additions & 4 deletions rootfs/etc/services.d/cron/finish

This file was deleted.

8 changes: 0 additions & 8 deletions rootfs/etc/services.d/cron/run

This file was deleted.

4 changes: 0 additions & 4 deletions rootfs/etc/services.d/klaxon/finish

This file was deleted.

5 changes: 0 additions & 5 deletions rootfs/etc/services.d/klaxon/run

This file was deleted.