anchor.diff:  # Salt Configuration
   #######
   
  -RUN wget -O- --quiet https://bootstrap.saltstack.com | \
  -    sudo sh -s -- -g https://github.com/saltstack/salt.git git v2014.7.0rc2 || true
  +# Install salt from git
  +#RUN wget -O- --quiet https://bootstrap.saltstack.com | \
  +#    sudo sh -s -- -g https://github.com/saltstack/salt.git git v2014.7.0rc3 || true  
  +
  +# Install stable salt minion, currently 2014.1.11
  +RUN add-apt-repository 'deb http://debian.saltstack.com/debian wheezy-saltstack main' && \
  +    wget -q -O- "http://debian.saltstack.com/debian-salt-team-joehealy.gpg.key" | apt-key add - && \
  +    sudo apt-get update && sudo apt-get install -y salt-minion
   
   # for now - only masterless salt is used
  -RUN echo "file_client: local\nmaster: localhost" > /etc/salt/minion
  +RUN echo "file_client: local\nmaster: localhost\n" > /etc/salt/minion
   
   # Preseed local master-minion, in case we need master against gitfs remote
   #RUN cd /tmp && \
  
positive.code: COPY ./pillar/koha/admin.sls.example /srv/pillar/koha/admin.sls
  
  ADD ./salt/common/init.sls /srv/salt/common/init.sls
  RUN salt-call --local state.sls common
  
  ADD ./salt/koha/watir.sls /srv/salt/koha/watir.sls
  RUN salt-call --local state.sls koha.watir
  
  ADD ./salt/koha/init.sls /srv/salt/koha/init.sls 
  RUN salt-call --local state.sls koha
  
  # Need mysql server to create initial db
  ADD ./salt/mysql/server.sls /srv/salt/mysql/server.sls
  RUN salt-call --local state.sls mysql.server
  
  # Koha common settings
  ADD ./salt/koha/common.sls /srv/salt/koha/common.sls
  ADD ./salt/koha/files/koha-common.cnf /srv/salt/koha/files/koha-common.cnf
  ADD ./salt/koha/files/koha-conf.xml.tmpl /srv/salt/koha/files/koha-conf.xml.tmpl
  ADD ./salt/koha/files/zebra.passwd.tmpl /srv/salt/koha/files/zebra.passwd.tmpl
  RUN salt-call --local state.sls koha.common
  
  # Koha-restful API
  ADD ./salt/koha/restful.sls /srv/salt/koha/restful.sls
  ADD ./salt/koha/restful-config.sls /srv/salt/koha/restful-config.sls
  ADD ./salt/koha/files/koha-restful-config.yaml /srv/salt/koha/files/koha-restful-config.yaml
  RUN salt-call --local state.sls koha.restful
  
  #######
  # Salt Provisioning - step 2
  
negative.code:  
  RUN apt-get update
  
  RUN DEBIAN_FRONTEND=noninteractive apt-get install -y wget less curl git nmap socat netcat tree htop \
      unzip sudo python-software-properties
  
  ENV KOHA_ADMINUSER admin
  ENV KOHA_ADMINPASS secret
  