mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-26 10:08:40 -05:00
Merge pull request #405 from puppetlabs/add-make-to-dockerfiles
Adding make to the other two Dockerfiles
This commit is contained in:
commit
6374f376b9
2 changed files with 16 additions and 3 deletions
|
|
@ -17,6 +17,12 @@ COPY docker/docker-entrypoint.sh /usr/local/bin/
|
||||||
ENV LOGFILE=/dev/stdout \
|
ENV LOGFILE=/dev/stdout \
|
||||||
RACK_ENV=production
|
RACK_ENV=production
|
||||||
|
|
||||||
|
RUN apt-get update -qq && \
|
||||||
|
apt-get install -y --no-install-recommends make && \
|
||||||
|
apt-get clean autoclean && \
|
||||||
|
apt-get autoremove -y && \
|
||||||
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
RUN gem install vmpooler -v ${vmpooler_version} && \
|
RUN gem install vmpooler -v ${vmpooler_version} && \
|
||||||
chmod +x /usr/local/bin/docker-entrypoint.sh
|
chmod +x /usr/local/bin/docker-entrypoint.sh
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,17 +14,24 @@ RUN mkdir -p /var/lib/vmpooler
|
||||||
|
|
||||||
WORKDIR /var/lib/vmpooler
|
WORKDIR /var/lib/vmpooler
|
||||||
|
|
||||||
|
RUN echo "deb http://httpredir.debian.org/debian jessie main" >/etc/apt/sources.list.d/jessie-main.list
|
||||||
|
|
||||||
|
RUN apt-get update -qq && \
|
||||||
|
apt-get install -y --no-install-recommends make redis-server && \
|
||||||
|
apt-get clean autoclean && \
|
||||||
|
apt-get autoremove -y && \
|
||||||
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
ADD Gemfile* /var/lib/vmpooler/
|
ADD Gemfile* /var/lib/vmpooler/
|
||||||
|
|
||||||
RUN bundle install --system
|
RUN bundle install --system
|
||||||
|
|
||||||
RUN ln -s /opt/jruby/bin/jruby /usr/bin/jruby
|
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
|
COPY . /var/lib/vmpooler
|
||||||
|
|
||||||
ENV VMPOOLER_LOG /var/log/vmpooler.log
|
ENV VMPOOLER_LOG /var/log/vmpooler.log
|
||||||
|
|
||||||
CMD \
|
CMD \
|
||||||
/etc/init.d/redis-server start \
|
/etc/init.d/redis-server start \
|
||||||
&& /var/lib/vmpooler/scripts/vmpooler_init.sh start \
|
&& /var/lib/vmpooler/scripts/vmpooler_init.sh start \
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue