Skip to content

Commit

Permalink
use rails.logger datacite/datacite#373
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Fenner committed Dec 15, 2019
1 parent 81e187d commit a09330e
Show file tree
Hide file tree
Showing 67 changed files with 852 additions and 1,369 deletions.
856 changes: 628 additions & 228 deletions .rubocop.yml

Large diffs are not rendered by default.

360 changes: 0 additions & 360 deletions .rubocop_todo.yml

This file was deleted.

8 changes: 2 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN bash -lc 'rvm --default use ruby-2.4.4'

# Update installed APT packages
RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \
apt-get install ntp wget tzdata pandoc -y && \
apt-get install ntp wget tzdata -y && \
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

# Enable Passenger and Nginx and remove the default site
Expand Down Expand Up @@ -49,21 +49,17 @@ RUN mkdir -p tmp/pids && \
RUN rm -f /etc/service/sshd/down && \
/etc/my_init.d/00_regen_ssh_host_keys.sh

# Install Ruby gems for middleman
WORKDIR /home/app/webapp/vendor/middleman
RUN /sbin/setuser app bundle install

# Add Runit script for shoryuken workers
WORKDIR /home/app/webapp
RUN mkdir /etc/service/shoryuken
ADD vendor/docker/shoryuken.sh /etc/service/shoryuken/run

# Run additional scripts during container startup (i.e. not at build time)
RUN mkdir -p /etc/my_init.d

# install custom ssh key during startup
COPY vendor/docker/10_ssh.sh /etc/my_init.d/10_ssh.sh

COPY vendor/docker/70_index_page.sh /etc/my_init.d/70_index_page.sh
# COPY vendor/docker/80_flush_cache.sh /etc/my_init.d/80_flush_cache.sh
COPY vendor/docker/90_migrate.sh /etc/my_init.d/90_migrate.sh

Expand Down
Loading

0 comments on commit a09330e

Please sign in to comment.