Browse Source

Adjust multi-process docker image do build based on current workdir

Dominik Sander 9 years ago
parent
commit
8a633e8b29
2 changed files with 18 additions and 5 deletions
  1. 17 4
      docker/multi-process/Dockerfile
  2. 1 1
      docker/multi-process/scripts/init

+ 17 - 4
docker/multi-process/Dockerfile

@@ -1,12 +1,25 @@
-FROM cantino/huginn-single-process:latest
+FROM ubuntu:14.04
 MAINTAINER Andrew Cantino
 
-WORKDIR /app
+ADD docker/scripts/prepare /scripts/prepare
+RUN /scripts/prepare
 
-ADD scripts/standalone-packages /scripts/standalone-packages
+ADD docker/multi-process/scripts/standalone-packages /scripts/standalone-packages
 RUN /scripts/standalone-packages
 
-ADD scripts/init /scripts/init
+WORKDIR /app
+
+ADD ["Gemfile", "Gemfile.lock", "/app/"]
+ADD lib/gemfile_helper.rb /app/lib/
+ADD vendor/gems /app/vendor/gems
+
+RUN chown -R huginn:huginn /app && \
+    sudo -u huginn -H echo "gem 'sqlite3', '~> 1.3.11'" >> /app/Gemfile && \
+    sudo -u huginn -H LC_ALL=en_US.UTF-8 RAILS_ENV=production ON_HEROKU=true bundle install --without test development --path vendor/bundle -j 4
+COPY . /app
+
+ADD ["docker/scripts/setup", "docker/multi-process/scripts/init", "/scripts/"]
+RUN /scripts/setup
 
 VOLUME /var/lib/mysql
 

+ 1 - 1
docker/multi-process/scripts/init

@@ -46,7 +46,7 @@ echo "RAILS_SERVE_STATIC_FILES=true" >> .env
 
 chmod ugo+r /app/.env
 source /app/.env
-sudo -u huginn -H bundle install --deployment --without test
+sudo -u huginn -H bundle install --without test development --path vendor/bundle
 
 # use default port number if it is still not set
 case "${DATABASE_ADAPTER}" in