mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-26 01:58:41 -05:00
(maint) Bump version to 2.4.0
Upgrade to jruby 9.3.6.0 Remove workaround for jruby 9.2 using JRUBY_OPTS=-Xinvokedynamic.yield=false Removed unused dependency nokogiri?
This commit is contained in:
parent
843f36e152
commit
b859743694
10 changed files with 38 additions and 71 deletions
|
|
@ -1,12 +1,12 @@
|
|||
# This Dockerfile is intended to be used with the
|
||||
# docker-compose file in the same directory.
|
||||
|
||||
FROM jruby:9.2-jdk
|
||||
FROM jruby:9.3-jdk
|
||||
|
||||
ENV RACK_ENV=production
|
||||
|
||||
RUN apt-get update -qq && \
|
||||
apt-get install -y --no-install-recommends make && \
|
||||
apt-get install -y --no-install-recommends make git && \
|
||||
apt-get clean autoclean && \
|
||||
apt-get autoremove -y && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ services:
|
|||
- VMPOOLER_CONFIG_FILE=/etc/vmpooler/vmpooler.yaml
|
||||
- REDIS_SERVER=redislocal
|
||||
- LOGFILE=/dev/null
|
||||
- JRUBY_OPTS=-Xinvokedynamic.yield=false
|
||||
- VMPOOLER_TRACING_ENABLED=true
|
||||
- VMPOOLER_TRACING_JAEGER_HOST=http://jaeger-aio:14268/api/traces
|
||||
image: vmpooler-local
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ docker run -it --rm \
|
|||
-v $(pwd)/docker:/app \
|
||||
-v $(pwd):/app/vmpooler-source \
|
||||
$(grep ^FROM docker/Dockerfile |cut -d ' ' -f2) \
|
||||
/bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends make && cd /app && gem install bundler && bundle install --jobs 3 && bundle update; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'
|
||||
/bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends make git && cd /app && gem install bundler && bundle install --jobs 3 && bundle update; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'
|
||||
rmdir docker/vmpooler-source
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue