some changes

compose/docker-compose.yml

-version: "2"
+version: "1"
 services:
   postgres:
-    image: unixelias/postgres-dspace:9.6-ptbr
+          image: postgres:latest
     hostname: postgres
     restart: always
     volumes:
       - db_data:/var/lib/postgresql/data
 
   dspace:
-    image: unixelias/docker-dspace:dev
+    image: becram/docker-dspace-ole
     # If you wanto to change the configuration you can build again
     # and add custom config files
     #build: ./dspace
@@ -22,8 +22,7 @@ services:
       - POSTGRES_ADMIN_PASSWORD=postgres
       - POSTGRES_SCHEMA=dspace
       - POSTGRES_USER=dspace
-      - POSTGRES_PASSWORD=password
+      - POSTGRES_PASSWORD=dspace
     command: start-dspace
 
-volumes:
-  db_data:
+

docker/dev/Dockerfile

@@ -4,7 +4,7 @@
 
 FROM ubuntu
 
-MAINTAINER Elias Alves <elias.alves@ufvjm.edu.br>
+MAINTAINER Bikram Dhoju <bikram.dhoju@olenepal.org>
 
 ARG BUILD_DATE
 ARG VCS_REF
@@ -15,22 +15,22 @@ LABEL Name="Dspace" \
       Architecture="x86_64" \
       org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.name="Dspace" \
-      org.label-schema.description="Deployment of Dspace for the Institutional Repository of UFVJM" \
+      org.label-schema.description="Deployment of Dspace for EPustakalaya" \
       org.label-schema.url="http://www.dspace.org/" \
       org.label-schema.vcs-ref=$VCS_REF \
-      org.label-schema.vcs-url="https://github.com/unixelias/docker-dspace" \
-      org.label-schema.vendor="Elias Alves at UFVJM" \
+      org.label-schema.vcs-url="https://github.com/Pustakalaya/pustakalaya" \
+      org.label-schema.vendor="Bikram Dhoju for OLE Nepal" \
       org.label-schema.version="6.0" \
       org.label-schema.version="dev" \
       org.label-schema.version="test" \
       org.label-schema.version="source" \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.docker.cmd="docker run -d --link dspace_db:postgres -p 8080:8080 unixelias/docker-dspace"
+      org.label-schema.docker.cmd="docker run -d --link dspace_db:postgres -p 8080:8080 postgres"
 
 # Environment variables
 ENV DSPACE_VERSION=6.0 \
     TOMCAT_MAJOR=8 \
-    TOMCAT_VERSION=8.5.16 \
+    TOMCAT_VERSION=8.5.20 \
     MAVEN_MAJOR=3 \
     MAVEN_VERSION=3.5.0
 
@@ -93,6 +93,7 @@ RUN mkdir -p maven \
 # Some configs for 6.0
 COPY ./config/setenv.sh "$CATALINA_HOME"/bin
 COPY ./config/server.xml "$CATALINA_HOME"/conf
+COPY ./config/localhost/*   "$CATALINA_HOME"/conf/Catalina/localhost/
 
 # # Getting and unpacking Dspace
 # RUN mkdir -p dspace \
@@ -105,25 +106,28 @@ COPY ./config/server.xml "$CATALINA_HOME"/conf
 # git clone https://github.com/unixelias/dspace.git -b dspace-6_x dspace &&
 
 # Build, install and clean
-RUN git clone https://github.com/unixelias/dspace.git -b dspace-6_x dspace \
-    && cd dspace && ../maven/bin/mvn -q package \
-    && cd dspace/target/dspace-installer \
-    && ant init_installation init_configs install_code copy_webapps \
+RUN git clone https://github.com/Pustakalaya/pustakalaya  -b development  dspace 
+
+#COPY ./config/pom.xml  dspace/dspace/pom.xml
+ 
+RUN cd dspace && ../maven/bin/mvn -X package -Dmirage2.on=true 
+    
+RUN cd dspace/target/dspace-installer \
+    && ant init_installation init_configs install_code copy_webapps  \
     && rm -fr "$CATALINA_HOME/webapps" && mv -f /dspace/webapps "$CATALINA_HOME" \
     && sed -i s/CONFIDENTIAL/NONE/ /usr/local/tomcat/webapps/rest/WEB-INF/web.xml \
     && rm -fr ~/.m2 && rm -fr /tmp/* && apt-get remove -y ant \
-    && rm -rf /usr/local/tomcat/webapps/oai \
-    && rm -rf /usr/local/tomcat/webapps/sword \
-    && rm -rf /usr/local/tomcat/webapps/swordv2 \
-    && rm -rf /usr/local/tomcat/webapps/xmlui \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Install root filesystem
 ADD ./rootfs /
-COPY ./config/local.cfg /dspace/config/local.cfg.UTF-8
 
+#ADD ./config/vendor /usr/local/tomcat/webapps/xmlui/themes/Mirage2/
+
+COPY ./config/local.cfg /dspace/config/local.cfg
+COPY ./config/dspace.cfg /dspace/config/dspace.cfg
 # Change the enconding of local.cfg to work with pt_BR
-RUN iconv -f UTF-8 -t ISO-8859-1 /dspace/config/local.cfg.UTF-8 > /dspace/config/local.cfg
+#RUN iconv -f UTF-8 -t ISO-8859-1 /dspace/config/local.cfg.UTF-8 > /dspace/config/local.cfg
 
 VOLUME $DSPACE_HOME/assetstore
 VOLUME $DSPACE_HOME/config
@@ -135,7 +139,7 @@ WORKDIR $DSPACE_HOME
 # Build info
 RUN echo "Ubuntu GNU/Linux 16.04 (xenial) image. (`uname -rsv`)" >> /root/.built && \
     echo "- with `java -version 2>&1 | awk 'NR == 2'`" >> /root/.built && \
-    echo "- with DSpace $DSPACE_VERSION on Tomcat $TOMCAT_VERSION"  >> /root/.built
+    echo "- with DSpace $DSPACE_VERSION on Tomcat $TOMCAT_VERSION for OLE Nepal"  >> /root/.built
 
 EXPOSE 8080
 

docker/dev/config/localhost/ROOT.xml.bak

+xmlui.xml
\ No newline at end of file

docker/dev/config/localhost/jspui.xml

+<?xml version='1.0'?>
+<Context
+    docBase="/dspace/webapps/jspui"
+    reloadable="true"
+    cachingAllowed="false"/>

docker/dev/config/localhost/oai.xml

+<?xml version='1.0'?>
+<Context
+    docBase="/usr/local/tomcat/webapps/oai"
+    reloadable="true"
+    cachingAllowed="false"/>

docker/dev/config/localhost/rdf.xml

+<?xml version='1.0'?>
+<Context
+    docBase="/usr/local/tomcat/webapps/rdf"
+    reloadable="true"
+    cachingAllowed="false"/>

docker/dev/config/localhost/rest.xml

+<?xml version='1.0'?>
+<Context
+    docBase="/usr/local/tomcat/webapps/rest"
+    reloadable="true"
+    cachingAllowed="false"/>

docker/dev/config/localhost/solr.xml

+<?xml version='1.0'?>
+<Context
+    docBase="/usr/local/tomcat/webapps/solr"
+    reloadable="true"
+    cachingAllowed="false"/>

docker/dev/config/localhost/sword.xml

+<?xml version='1.0'?>
+<Context
+    docBase="/usr/local/tomcat/webapps/sword"
+    reloadable="true"
+    cachingAllowed="false"/>

docker/dev/config/localhost/swordv2.xml

+<?xml version='1.0'?>
+<Context
+    docBase="/usr/local/tomcat/webapps/swordv2"
+    reloadable="true"
+    cachingAllowed="false"/>

docker/dev/config/localhost/xmlui.xml

+<?xml version='1.0'?>
+<Context
+    docBase="/usr/local/tomcat/webapps/xmlui"
+    reloadable="true"
+    cachingAllowed="false"/>

docker/dev/config/vendor/bootstrap-sass-official/.bower.json

+{
+  "name": "bootstrap-sass",
+  "version": "3.3.0",
+  "homepage": "https://github.com/twbs/bootstrap-sass",
+  "authors": [
+    "Thomas McDonald",
+    "Tristan Harward",
+    "Peter Gumeson",
+    "Gleb Mazovetskiy"
+  ],
+  "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
+  "main": [
+    "assets/stylesheets/_bootstrap.scss",
+    "assets/fonts/bootstrap/glyphicons-halflings-regular.eot",
+    "assets/fonts/bootstrap/glyphicons-halflings-regular.svg",
+    "assets/fonts/bootstrap/glyphicons-halflings-regular.ttf",