gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1662 from tobru/openshift_compatibility

Browse source 
adapt dir permissions for openshift and add dumb-init
This commit is contained in:
James Mason 2017-11-02 09:38:35 -07:00 • committed by GitHub
commit 09941c76c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Dockerfile
View file

@ -16,6 +16,12 @@ RUN cd /usr/bin && \
tar -xf dockerize.tar.gz && \ tar -xf dockerize.tar.gz && \
rm dockerize.tar.gz rm dockerize.tar.gz
# dumb-init for a proper PID 1
RUN cd /tmp && \
wget https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
dpkg -i dumb-init_1.2.0_amd64.deb && \
rm dumb-init_1.2.0_amd64.deb
# explicitly add Gemfile and install dependencies using bundler to make use of # explicitly add Gemfile and install dependencies using bundler to make use of
# Docker's caching # Docker's caching
WORKDIR /osem/ WORKDIR /osem/
@ -25,12 +31,13 @@ RUN bundle install --without test development
# add OSEM files and prepare them for use inside a Docker container # add OSEM files and prepare them for use inside a Docker container
COPY . /osem/ COPY . /osem/
RUN chown osem.osem /osem/ -R && \ RUN chown -R osem.root /osem/ && \
chmod -R g=u /osem/ && \
mv /osem/config/database.yml.docker /osem/config/database.yml mv /osem/config/database.yml.docker /osem/config/database.yml
# data directory is used to cache the secret key in a file # data directory is used to cache the secret key in a file
ENV DATA_DIR /data ENV DATA_DIR /data
RUN install -d -m 0700 -o osem $DATA_DIR RUN install -d -m 0770 -o osem -g root $DATA_DIR
VOLUME ["$DATA_DIR"] VOLUME ["$DATA_DIR"]
USER osem USER osem
@ -42,4 +49,7 @@ COPY docker/init.sh /init.sh
# from a webserver # from a webserver
ENV RAILS_SERVE_STATIC_FILES 1 ENV RAILS_SERVE_STATIC_FILES 1
# Runs "/usr/bin/dumb-init -- /my/script --with --args"
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
CMD ["bash", "/init.sh"] CMD ["bash", "/init.sh"]