diff --git a/Dockerfile b/Dockerfile index 1ec1baf..c96477b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,10 +14,15 @@ RUN apt-get update && apt-get install -y nodejs --no-install-recommends && \ COPY Gemfile /usr/src/app/ COPY Gemfile.lock /usr/src/app/ -RUN bundle install +RUN env NOKOGIRI_USE_SYSTEM_LIBRARIES=true bundle install -COPY install_extjs.rb /usr/src/app/ -RUN /usr/src/app/install_extjs.rb +#COPY install_extjs.rb /usr/src/app/ +#RUN /usr/src/app/install_extjs.rb + +COPY extjs-4.1.1.zip /usr/lib/ + +RUN unzip -d /usr/lib /usr/lib/extjs-4.1.1.zip; \ + mv /usr/lib/ext-4.1.1a /usr/lib/extjs COPY install_famfamfam.rb /usr/src/app/ RUN /usr/src/app/install_famfamfam.rb diff --git a/docker-compose.yml b/docker-compose.yml index 2650a9b..5647e63 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,12 @@ +# BikeShed +# +# cp config/database.yml.example config/database.yml +# +# docker-compose -f docker-compose.demo.yml build +# docker-compose -f docker-compose.demo.yml up -d db +# docker-compose -f docker-compose.demo.yml run bikeshed rake db:setup +# docker-compose -f docker-compose.demo.yml up -d bikeshed + db: image: postgres ports: diff --git a/extjs-4.1.1.zip b/extjs-4.1.1.zip new file mode 100644 index 0000000..9fe5812 Binary files /dev/null and b/extjs-4.1.1.zip differ