anchor.diff:          software-properties-common \
           postgresql-client \
           openjdk-8-jdk \
  -#       openjdk-8-jre-dcevm \
  -        tomcat8 \
           ant \
           maven \
           unzip
   
  +# Define commonly used JAVA_HOME variable
  +ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
  +
   WORKDIR /tmp
  +
  +#DCEVM installation
   #Since DCEVM for Xenial seems kind of broken, we download it from zetzy
   RUN wget http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8-jre-dcevm/openjdk-8-jre-dcevm_8u112-1_amd64.deb && \
       dpkg -i openjdk-8-jre-dcevm_8u112-1_amd64.deb
   
  -# Define commonly used JAVA_HOME variable
  -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
  +# Install Tomcat 8
  +ENV CATALINA_HOME=/usr/local/tomcat
  +ENV TOMCAT_MAJOR=8 TOMCAT_VERSION=8.0.44
  +ENV TOMCAT_TGZ_URL=https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz
  +RUN mkdir -p $CATALINA_HOME
  +RUN wget "$TOMCAT_TGZ_URL" -O tomcat.tar.gz \
  +    && tar -xvf tomcat.tar.gz --strip-components=1 -C "$CATALINA_HOME"
  +ENV PATH=$CATALINA_HOME/bin:$PATH
   
  +#Create DSpace folders
   RUN mkdir -p /srv/dspace /srv/dspace-src
  +ENV DSPACE_HOME=/srv/dspace
  +ENV PATH=$DSPACE_HOME/bin:$PATH
   
   RUN mkdir /root/.m2
   #VOLUME /root/.m2
  
positive.code: # Configure remote debugging and extra memory
  COPY setenv.sh $CATALINA_HOME/bin
  
  
  #Install DCEVM
  #COPY libjvm.so /usr/lib/jvm/java-7-oracle/jre/lib/amd64/dcevm/libjvm.so
  RUN curl -fSL https://github.com/dcevm/dcevm/releases/download/full-jdk7u79%2B8/DCEVM-full-7u79-installer.jar -o DCEVM-full-7u79-installer.jar
  RUN unzip DCEVM-full-7u79-installer.jar
  RUN mkdir -p /usr/lib/jvm/java-7-oracle/jre/lib/amd64/dcevm/
  RUN ls -l
  RUN mv linux_amd64_compiler2/product/libjvm.so /usr/lib/jvm/java-7-oracle/jre/lib/amd64/dcevm/libjvm.so
  
  
  #Install Hotswap agent
  #COPY HotswapAgent-0.3.zip /usr/lib/hotswapagent/HotswapAgent-0.3.zip
  ADD https://github.com/HotswapProjects/HotswapAgent/releases/download/RELEASE-0.3/HotswapAgent-0.3.zip HotswapAgent-0.3.zip
  RUN mkdir /usr/lib/hotswapagent
  RUN unzip HotswapAgent-0.3.zip -d /usr/lib/hotswapagent/
  RUN rm HotswapAgent-0.3.zip
  
  RUN apt install -y sudo
  
  
negative.code: #ADD https://download.jetbrains.com/idea/ideaIC-2016.1.2.tar.gz /home/developer/idea
  
  #Required for running Idea IDE
  #RUN apt-get install libxext-dev libxrender-dev libxtst-dev -y
  
  #To make intellij work. For some reason, it requires the fonts to be installed
  #RUN  apt-get install fontconfig fontconfig-config fonts-dejavu-core fonts-dejavu-extra -y
  
  
  #Uncomment this lines to set a custom UID. E.g.: 1009
  #RUN export uid=1009 && usermod -u $uid developer
  #RUN  chown -R developer:developer /home/developer
  
  RUN apt-get install -y locales && locale-gen en_US.UTF-8
  ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
  
  
  #Also, give developer ownership of CATALINA_HOME
  RUN chown -R developer:developer $CATALINA_HOME/
  USER developer
  
  USER developer
  #Install ruby deps
  RUN sudo apt-get install -y bison build-essential zlib1g-dev libssl-dev libxml2-dev git-core
  RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import - \
    && curl -sSL https://get.rvm.io | bash -s stable --ruby
  
  RUN bash -c "source ~/.profile \
  