Skip to content

Commit

Permalink
Add dockerfile without redis
Browse files Browse the repository at this point in the history
This commit adds a dockerfile to install vmpooler without a local redis installation. Without this change the dockerfile provided assumes a local redis instance will be running. The dockerfile with redis is retained as 'Dockerfile-aio'. Additionally, the directory '/var/log/vmpooler' is no longer created since vmpooler uses '/var/log/vmpooler.log'.
  • Loading branch information
mattkirby authored and mattkirby committed May 30, 2018
1 parent 67d5ef7 commit 9b8b353
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 6 deletions.
8 changes: 2 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

FROM jruby:9.1-jdk

RUN mkdir -p /var/lib/vmpooler && mkdir /var/log/vmpooler
RUN mkdir -p /var/lib/vmpooler

WORKDIR /var/lib/vmpooler

Expand All @@ -19,14 +19,10 @@ RUN bundle install --system

RUN ln -s /opt/jruby/bin/jruby /usr/bin/jruby

RUN echo "deb http://httpredir.debian.org/debian jessie main" >/etc/apt/sources.list.d/jessie-main.list
RUN apt-get update && apt-get install -y redis-server && rm -rf /var/lib/apt/lists/*

COPY . /var/lib/vmpooler

ENV VMPOOLER_LOG /var/log/vmpooler.log
CMD \
/etc/init.d/redis-server start \
&& /var/lib/vmpooler/scripts/vmpooler_init.sh start \
/var/lib/vmpooler/scripts/vmpooler_init.sh start \
&& while [ ! -f ${VMPOOLER_LOG} ]; do sleep 1; done ; \
tail -f ${VMPOOLER_LOG}
32 changes: 32 additions & 0 deletions Dockerfile-aio
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Run vmpooler in a Docker container! Configuration can either be embedded
# and built within the current working directory, or stored in a
# VMPOOLER_CONFIG environment value and passed to the Docker daemon.
#
# BUILD:
# docker build -t vmpooler .
#
# RUN:
# docker run -e VMPOOLER_CONFIG -p 80:4567 -it vmpooler

FROM jruby:9.1-jdk

RUN mkdir -p /var/lib/vmpooler

WORKDIR /var/lib/vmpooler

ADD Gemfile* /var/lib/vmpooler/
RUN bundle install --system

RUN ln -s /opt/jruby/bin/jruby /usr/bin/jruby

RUN echo "deb http://httpredir.debian.org/debian jessie main" >/etc/apt/sources.list.d/jessie-main.list
RUN apt-get update && apt-get install -y redis-server && rm -rf /var/lib/apt/lists/*

COPY . /var/lib/vmpooler

ENV VMPOOLER_LOG /var/log/vmpooler.log
CMD \
/etc/init.d/redis-server start \
&& /var/lib/vmpooler/scripts/vmpooler_init.sh start \
&& while [ ! -f ${VMPOOLER_LOG} ]; do sleep 1; done ; \
tail -f ${VMPOOLER_LOG}

0 comments on commit 9b8b353

Please sign in to comment.