diff --git a/images/base/blacklight/Dockerfile b/images/base/blacklight/Dockerfile deleted file mode 100644 index 1891295..0000000 --- a/images/base/blacklight/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM geoblacklight/base-rails - -MAINTAINER Eliot Jordan - -# generate new rails app -WORKDIR /usr/src -RUN apt-get update && apt-get -y install libsqlite3-dev libpq-dev - -# Clone geoblacklight repo and geoblacklight-schema submodule -RUN git clone --recurse https://github.com/geoblacklight/geoblacklight.git - -# Install time-consuming dependencies -WORKDIR /usr/src/geoblacklight -RUN bundle -RUN gem install unicorn - -# Remove app -RUN rm -rf /usr/src/geoblacklight/ \ No newline at end of file diff --git a/images/base/baseimage/Dockerfile b/images/baseimage/Dockerfile similarity index 100% rename from images/base/baseimage/Dockerfile rename to images/baseimage/Dockerfile diff --git a/images/geoblacklight/geoblacklight/Dockerfile b/images/geoblacklight/Dockerfile similarity index 100% rename from images/geoblacklight/geoblacklight/Dockerfile rename to images/geoblacklight/Dockerfile diff --git a/images/geoblacklight/geoblacklight/load_test_data.sh b/images/geoblacklight/load_test_data.sh similarity index 100% rename from images/geoblacklight/geoblacklight/load_test_data.sh rename to images/geoblacklight/load_test_data.sh diff --git a/images/geoblacklight/geoblacklight/unicorn.rb b/images/geoblacklight/unicorn.rb similarity index 100% rename from images/geoblacklight/geoblacklight/unicorn.rb rename to images/geoblacklight/unicorn.rb diff --git a/images/base/rails/Dockerfile b/images/rails/Dockerfile similarity index 100% rename from images/base/rails/Dockerfile rename to images/rails/Dockerfile diff --git a/images/geoblacklight/solr/Dockerfile b/images/solr/Dockerfile similarity index 100% rename from images/geoblacklight/solr/Dockerfile rename to images/solr/Dockerfile