Rewrite to Novagrant mode

Fix kohadev to work again WIP Rewrite koha-docker to not use Vagrant Remove unused ports

Rewrite to Novagrant mode
Fix kohadev to work again WIP Rewrite koha-docker to not use Vagrant Remove unused ports
3c4fb4eb · Benjamin Rokseth · dbaed482 · 3c4fb4eb · 3c4fb4eb · 3c4fb4eb
Commit 3c4fb4eb authored Jul 04, 2016 by Benjamin Rokseth
--- a/.gitignore
+++ b/.gitignore
 .vagrant*
 orca
 build.log
+docker-compose/secrets.env
+docker-compose/docker-compose.yml
+provision
--- a/Makefile
+++ b/Makefile
 .PHONY: all test clean

+KOHAENV ?= dev
+
+ifdef NOVAGRANT
+CMD=bash
+KOHAPATH=$(shell pwd)
+NOVAGRANT=true
+HOST ?= localhost
+DOCKER_GW=172.19.0.1
+else
+CMD=vagrant ssh $(SHIP)
+KOHAPATH=/vagrant
+HOST ?= 192.168.50.1
+DOCKER_GW=$(HOST)
+NOVAGRANT=false
+endif
+
 all: reload build run

 reload: halt up provision

 halt:
-	vagrant halt
-
-up:
-	vagrant up
-
-provision:
-	vagrant provision
-
-upgrade:
-	vagrant ssh -c 'sudo docker pull mysql && sudo docker pull debian:wheezy && sudo docker pull busybox'
-
-mysql: create_data_volume mysql_pull_if_missing mysql_start
-
-# Data volume container for mysql - for persistent data. Create new if not existing
-create_data_volume:
-	@echo "======= CREATING MYSQL DATA VOLUME CONTAINER ======\n"
-	@vagrant ssh -c '(sudo docker inspect mysql_data > /dev/null && echo "mysql data volume already present") || \
-	docker run -d --name mysql_data -v /var/lib/mysql busybox echo "create data volume"'
-
-mysql_pull_if_missing:
-	@echo "Checking if there is an existing mysql image" ;\
-	MYSQL_IMAGE=`vagrant ssh -c 'sudo docker images | grep "mysql " |  grep " 5.6 "'` ;\
-	if [ "$$MYSQL_IMAGE" = "" ]; then \
-		echo "no existing mysql image with correct tag ... pulling"; \
-		vagrant ssh -c 'sudo docker pull mysql:5.6.20'; \
-    fi
-
-mysql_start:
-	@ CURRENT_MYSQL_IMAGE=`vagrant ssh -c 'sudo docker inspect --format {{.Image}} koha_docker_mysql'` ;\
-	LAST_MYSQL_IMAGE=`vagrant ssh -c 'sudo docker history --quiet --no-trunc mysql:5.6 | head -n 1'` ;\
-	echo "Current image: $$CURRENT_MYSQL_IMAGE" ;\
-	echo "Last image $$LAST_MYSQL_IMAGE" ;\
-	if [ $$CURRENT_MYSQL_IMAGE = $$LAST_MYSQL_IMAGE ]; then \
-		echo "mysql image up to date ... restarting"; \
-		vagrant ssh -c 'sudo docker restart koha_docker_mysql '; \
-	else \
-		echo "restarting container from new image ..."; \
-		vagrant ssh -c 'sudo docker stop koha_docker_mysql && sudo docker rm koha_docker_mysql'; \
-		vagrant ssh -c 'sudo docker run -d --name koha_docker_mysql -p 3306:3306 --volumes-from mysql_data \
-	  -e MYSQL_ROOT_PASSWORD=secret \
-	  -e MYSQL_USER=admin \
-	  -e MYSQL_PASSWORD=secret \
-	  -e MYSQL_DATABASE=koha_name \
-	  -t mysql:5.6.20 \
-	  mysqld --datadir=/var/lib/mysql --user=mysql --max_allowed_packet=64M --wait_timeout=6000 --bind-address=0.0.0.0' ;\
-	fi
-
-mysql_stop:
-	@echo "======= RESTARTING MYSQL CONTAINER ======\n"
-	vagrant ssh -c '(sudo docker stop koha_docker_mysql && sudo docker rm koha_docker_mysql) || true'
-
-gosmtp:	gosmtp_pull gosmtp_start
-
-gosmtp_pull:
-	vagrant ssh -c 'sudo docker pull digibib/gosmtpd:e51ec0b872867560461ab1e8c12b10fd63f5d3c1'
+	@$(NOVAGRANT) || vagrant halt
+	@$(NOVAGRANT) && sudo $(CMD) -c "cd $(KOHAPATH)/docker-compose && sudo docker-compose down" || true

-# for REAL forwarding, set env FORWARD_SMTP to receiving smtp service
-gosmtp_start:
-	@echo "restarting gosmtpd container  ..."; \
-	vagrant ssh -c 'sudo docker stop gosmtp && sudo docker rm gosmtp'; \
-	vagrant ssh -c 'sudo docker run -d --name gosmtp -p 8000:8000 \
-		-e FORWARD_SMTP=$(FORWARD_SMTP) \
-		-t digibib/gosmtpd:e51ec0b872867560461ab1e8c12b10fd63f5d3c1 ' ;\
+up:                                              ##
+	@$(NOVAGRANT) || vagrant up
+	@$(NOVAGRANT) && sudo $(CMD) -c "cd $(KOHAPATH)/docker-compose && sudo docker-compose up -d" || true

-gosms: gosms_pull gosms_start gosms_fake_listener
+shell_provision:					## Run ONLY shell provisioners
+	@$(NOVAGRANT) || vagrant provision --provision-with shell
+	-@$(NOVAGRANT) && ./provision.sh $(KOHAENV) $(KOHAPATH)

-gosms_pull:
-	vagrant ssh -c 'docker pull digibib/tcp-proxy:7660632e2afa09593941fd35ba09d6c3a948f342'
+provision:  shell_provision   	## Full provision

-# Start a fake listener at local port 8102 inside container
-gosms_fake_listener:
-	vagrant ssh -c "docker exec -d gosms sh -c 'while true; do { echo -e \"HTTP/1.1 200 OK\r\n\"; } | nc -l -p 8102; done'"
+wait_until_ready:
+	@echo "=======    wait until ready    ======\n"
+	$(CMD) -c 'sudo docker exec -t koha_$(KOHAENV) ./wait_until_ready.py'

-# for REAL forwarding, set env SMS_FORWARD_URL to receiving sms http service at HOST:PORT
-gosms_start:
-	@echo "restarting gosms container  ..."; \
-	vagrant ssh -c 'docker stop gosms && sudo docker rm gosms'; \
-	vagrant ssh -c 'docker run -d --name gosms -p 8101:8101 \
-		-t digibib/tcp-proxy:7660632e2afa09593941fd35ba09d6c3a948f342 \
-		/app/tcp-proxy -l :8101 -vv -r $(SMS_FORWARD_URL)' ;\
+rebuild=$(CMD) -c "cd $(KOHAPATH)/docker-compose &&\
+	  sudo docker-compose stop $(1) || true &&\
+	  sudo docker-compose rm -f $(1) || true &&\
+	  sudo docker-compose build $(1) &&\
+	  sudo docker-compose up --force-recreate --no-deps -d $(1)"

-build:
-	@echo "======= BUILDING KOHA CONTAINER ======\n"
-	vagrant ssh -c 'sudo docker build -t digibib/koha /vagrant '
+rebuild:
+	@echo "======= FORCE RECREATING koha_$(KOHAENV)======\n"
+	$(call rebuild,koha_$(KOHAENV))

 build_debianfiles:
 	@echo "======= BUILDING KOHA CONTAINER FROM LOCAL DEBIANFILES ======\n"
-	vagrant ssh -c 'sudo docker build -f /vagrant/Dockerfile.debianfiles -t digibib/koha /vagrant '
+	$(CMD) -c 'sudo docker build -f $(KOHAPATH)/Dockerfile.debianfiles -t digibib/koha $(KOHAPATH) '

-stop: 
-	@echo "======= STOPPING KOHA CONTAINER ======\n"
-	vagrant ssh -c 'sudo docker stop koha_docker' || true
-
-delete: stop
-	@echo "======= DELETING KOHA CONTAINER ======\n"
-	vagrant ssh -c 'sudo docker rm koha_docker' || true
+run: delete
+	$(CMD) -c 'cd $(KOHAPATH)/docker-compose && docker-compose up -d koha_$(KOHAENV)'

-KOHA_INSTANCE  ?= name
-KOHA_ADMINUSER ?= admin
-KOHA_ADMINPASS ?= secret
+stop:
+	$(CMD) -c 'cd $(KOHAPATH)/docker-compose && docker-compose stop koha_$(KOHAENV) || true'

-run: delete
-	@echo "======= RUNNING KOHA CONTAINER WITH LOCAL MYSQL ======\n"
-	@vagrant ssh -c 'sudo docker run -d --name koha_docker \
-	-p 80:80 -p 6001:6001 -p 8080:8080 -p 8081:8081 \
-	-e KOHA_INSTANCE=$(KOHA_INSTANCE) \
-	-e KOHA_ADMINUSER=$(KOHA_ADMINUSER) \
-	-e KOHA_ADMINPASS=$(KOHA_ADMINPASS) \
-	-e DEFAULT_LANGUAGE="$(DEFAULT_LANGUAGE)" \
-    -e INSTALL_LANGUAGES="$(INSTALL_LANGUAGES)" \
-	--cap-add=SYS_NICE --cap-add=DAC_READ_SEARCH \
-	-t digibib/koha' || echo "koha_docker container already running, please 'make delete' first"
-
-EMAIL_ENABLED ?= true
-SMTP_SERVER_HOST ?= mailrelay
-SMTP_SERVER_PORT ?= 2525
-MESSAGE_QUEUE_FREQUENCY ?= 1
-SMS_SERVER_HOST ?= http://localhost:8101
-SMS_FORWARD_URL ?= :8102
-
-run_with_messaging: gosmtp gosms delete
-	@echo "======= RUNNING KOHA CONTAINER WITH LOCAL MYSQL AND MESSAGING ======\n"
-	@vagrant ssh -c 'sudo docker run --link gosmtp:mailrelay --link gosms:smsproxy -d --name koha_docker \
-	-p 80:80 -p 6001:6001 -p 8080:8080 -p 8081:8081 \
-	-e KOHA_INSTANCE=$(KOHA_INSTANCE) \
-	-e KOHA_ADMINUSER=$(KOHA_ADMINUSER) \
-	-e KOHA_ADMINPASS=$(KOHA_ADMINPASS) \
-	-e DEFAULT_LANGUAGE="$(DEFAULT_LANGUAGE)" \
-    -e INSTALL_LANGUAGES="$(INSTALL_LANGUAGES)" \
-    -e EMAIL_ENABLED="$(EMAIL_ENABLED)" \
-    -e SMTP_SERVER_HOST="$(SMTP_SERVER_HOST)" \
-    -e SMTP_SERVER_PORT="$(SMTP_SERVER_PORT)" \
-    -e MESSAGE_QUEUE_FREQUENCY="$(MESSAGE_QUEUE_FREQUENCY)" \
-    -e SMS_SERVER_HOST="$(SMS_SERVER_HOST)" \
-    -e SMS_FORWARD_URL="$(SMS_FORWARD_URL)" \
-	--cap-add=SYS_NICE --cap-add=DAC_READ_SEARCH \
-	-t digibib/koha' || echo "koha_docker container already running, please 'make delete' first"
-
-# start koha with link to mysql container
-run_linked_db: mysql delete
-	@echo "======= RUNNING KOHA CONTAINER WITH MYSQL FROM LINKED DB CONTAINER ======\n"
-	@vagrant ssh -c 'sudo docker run --link koha_docker_mysql:koha_mysql -d --name koha_docker \
-	-p 80:80 -p 6001:6001 -p 8080:8080 -p 8081:8081 \
-	-e KOHA_INSTANCE=$(KOHA_INSTANCE) \
-	-e KOHA_ADMINUSER=$(KOHA_ADMINUSER) \
-	-e KOHA_ADMINPASS=$(KOHA_ADMINPASS) \
-	-e DEFAULT_LANGUAGE="$(DEFAULT_LANGUAGE)" \
-    -e INSTALL_LANGUAGES="$(INSTALL_LANGUAGES)" \
-	-t digibib/koha' || echo "koha_docker container already running, please 'make delete' first"
+delete: stop
+	$(CMD) -c 'cd $(KOHAPATH)/docker-compose && docker-compose rm -fv koha_$(KOHAENV) || true'

 logs:
-	vagrant ssh -c 'sudo docker logs koha_docker'
+	$(CMD) -c 'cd $(KOHAPATH)/docker-compose && docker-compose logs --no-color koha_$(KOHAENV)'

 logs-f:
-	vagrant ssh -c 'sudo docker logs -f koha_docker'
-
-nsenter:
-	vagrant ssh -c 'sudo docker exec -it koha_docker /bin/bash'
+	$(CMD) -c 'cd $(KOHAPATH)/docker-compose && docker-compose logs -f koha_$(KOHAENV)'

 browser:
-	vagrant ssh -c 'firefox "http://localhost:8081/" > firefox.log 2> firefox.err < /dev/null' &
-
-wait_until_ready:
-	@echo "=======    wait until ready    ======\n"
-	vagrant ssh -c 'sudo docker exec -t koha_docker ./wait_until_ready.py'
+	$(CMD) -c 'firefox "http://localhost:8081/" > firefox.log 2> firefox.err < /dev/null' &

 test: wait_until_ready
 	@echo "======= TESTING KOHA CONTAINER ======\n"

-clean:
-	vagrant destroy --force
-
 login: # needs EMAIL, PASSWORD, USERNAME
-	@ vagrant ssh -c 'sudo docker login --email=$(EMAIL) --username=$(USERNAME) --password=$(PASSWORD)'
+	@ $(CMD) -c 'sudo docker login --email=$(EMAIL) --username=$(USERNAME) --password=$(PASSWORD)'

 tag = "$(shell git rev-parse HEAD)"

 tag:
-	vagrant ssh -c 'sudo docker tag -f digibib/koha digibib/koha:$(tag)'
+	$(CMD) -c 'sudo docker tag -f digibib/koha digibib/koha:$(tag)'

 push: tag
 	@echo "======= PUSHING KOHA CONTAINER ======\n"
-	vagrant ssh -c 'sudo docker push digibib/koha'
+	$(CMD) -c 'sudo docker push digibib/koha'
+
+docker_cleanup:						## Clean up unused docker containers and images
+	@echo "cleaning up unused containers, images and volumes"
+	#$(CMD) -c 'sudo docker rm $$(sudo docker ps -aq -f status=exited) 2> /dev/null || true'
+	$(CMD) -c 'sudo docker rmi $$(sudo docker images -aq -f dangling=true) 2> /dev/null || true'
+	$(CMD) -c 'sudo docker volume rm $$(sudo docker volume ls -q -f=dangling=true) 2> /dev/null || true'
+
+######### OLD MAKE TARGETS ############
+# for REAL forwarding, set env FORWARD_SMTP to receiving smtp service
+gosmtp_start:
+	@echo "restarting gosmtpd container  ..."; \
+	vagrant ssh -c 'sudo docker stop gosmtp && sudo docker rm gosmtp'; \
+	vagrant ssh -c 'sudo docker run -d --name gosmtp -p 8000:8000 \
+		-e FORWARD_SMTP=$(FORWARD_SMTP) \
+		-t digibib/gosmtpd:e51ec0b872867560461ab1e8c12b10fd63f5d3c1 ' ;\
+
+# Start a fake listener at local port 8102 inside container
+gosms_fake_listener:
+	vagrant ssh -c "docker exec -d gosms sh -c 'while true; do { echo -e \"HTTP/1.1 200 OK\r\n\"; } | nc -l -p 8102; done'"
+
+# for REAL forwarding, set env SMS_FORWARD_URL to receiving sms http service at HOST:PORT
+gosms_start:
+	@echo "restarting gosms container  ..."; \
+	vagrant ssh -c 'docker stop gosms && sudo docker rm gosms'; \
+	vagrant ssh -c 'docker run -d --name gosms -p 8101:8101 \
+		-t digibib/tcp-proxy:7660632e2afa09593941fd35ba09d6c3a948f342 \
+		/app/tcp-proxy -l :8101 -vv -r $(SMS_FORWARD_URL)' ;\

-docker_cleanup:
-	@echo "cleaning up unused containers and images"
-	@vagrant ssh -c 'sudo /vagrant/docker-cleanup.sh'
--- a/docker-compose/docker-compose-template-build.yml
+++ b/docker-compose/docker-compose-template-build.yml
+---
+version: '2'
+
+networks:
+  backend:
+    driver: bridge
+
+services:
+  koha_build:
+    container_name: koha_build
+    image: "digibib/koha:${KOHA_IMAGE_TAG}"
+    build:
+      context: "${KOHAPATH}"
+      dockerfile: Dockerfile
+    networks:
+      - backend
+    depends_on:
+      - koha_mysql
+      - sip
+    cap_add:
+      - SYS_NICE
+      - DAC_READ_SEARCH
+      - MKNOD
+    environment:
+      KOHA_ADMINPASS: "${KOHA_ADMINPASS}"
+      KOHA_ADMINUSER: "${KOHA_ADMINUSER}"
+      KOHA_INSTANCE: "$KOHA_INSTANCE"
+      KOHA_DBHOST: koha_mysql
+      DEFAULT_LANGUAGE: nb-NO
+      EMAIL_ENABLED: "True"
+      SMTP_SERVER_HOST: mailrelay # access through network 'backend'
+      SMTP_SERVER_PORT: 2525
+      MESSAGE_QUEUE_FREQUENCY: 1
+      SMS_SERVER_HOST: "${SMS_SERVER_HOST}"
+      API_PASSPHRASE: "${API_PASSPHRASE}"
+      NLBASEUSER: "${NLBASEUSER}"
+      NLBASEPASS: "${NLBASEPASS}"
+      NLVENDORURL: "${NLVENDORURL}"
+      NLVENDORUSER: "${NLVENDORUSER}"
+      NLVENDORPASS: "${NLVENDORPASS}"
+      NLVENDORKEY: "${NLVENDORKEY}"
+    ports:
+      - "6001:6001"
+      - "8081:8081"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1m"
+        max-file: "2"
+
+  koha_mysql:
+    container_name: koha_mysql
+    image: mysql:5.6.20
+    networks:
+      - backend
+    cap_add:
+      - MKNOD
+    command:
+      - mysqld
+      - "--datadir=/var/lib/mysql"
+      - "--user=mysql"
+      - "--max_allowed_packet=64M"
+      - "--wait_timeout=6000"
+      - "--bind-address=0.0.0.0"
+    environment:
+      MYSQL_DATABASE: "koha_${KOHA_INSTANCE}"
+      MYSQL_PASSWORD: "${KOHA_ADMINPASS}"
+      MYSQL_ROOT_PASSWORD: "${KOHA_ADMINPASS}"
+      MYSQL_USER: "${KOHA_ADMINUSER}"
+    volumes_from:
+      - koha_mysql_data
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1m"
+        max-file: "2"
+
+  koha_mysql_data:
+    container_name: koha_mysql_data
+    image: "busybox:latest"
+    volumes:
+      - /var/lib/mysql
+
+  sip:
+    container_name: sip_proxy
+    image: "digibib/tcp-proxy:14dc5417bf211317351a0bae084db12c64a1dd45"
+    networks:
+      - backend
+    ports:
+      - "6002:9999"
+    command:
+      - "/app/tcp-proxy"
+      - "-vv"
+      - "-r"
+      - "${HOST}:${SIP_PORT}"
+      - "-replace=(|AB)10([0-9]{14})~$$1$$2"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1m"
+        max-file: "2"
--- a/docker-compose/docker-compose-template-dev.yml
+++ b/docker-compose/docker-compose-template-dev.yml
+---
+version: '2'
+
+networks:
+  backend:
+    driver: bridge
+
+services:
+  koha_dev:
+    container_name: koha_dev
+    image: "digibib/kohadev:${KOHA_IMAGE_TAG}"
+    build:
+      context: "${KOHAPATH}/kohadev"
+      dockerfile: Dockerfile
+    networks:
+      - backend
+    depends_on:
+      - koha_mysql
+      - sip
+    cap_add:
+      - SYS_NICE
+      - DAC_READ_SEARCH
+      - MKNOD
+    environment:
+      KOHA_ADMINPASS: "${KOHA_ADMINPASS}"
+      KOHA_ADMINUSER: "${KOHA_ADMINUSER}"
+      KOHA_INSTANCE: "$KOHA_INSTANCE"
+      KOHA_DBHOST: koha_mysql
+      DEFAULT_LANGUAGE: nb-NO
+      EMAIL_ENABLED: "True"
+      SMTP_SERVER_HOST: mailrelay # access through network 'backend'
+      SMTP_SERVER_PORT: 2525
+      MESSAGE_QUEUE_FREQUENCY: 1
+      SMS_SERVER_HOST: "${SMS_SERVER_HOST}"
+      API_PASSPHRASE: "${API_PASSPHRASE}"
+      NLBASEUSER: "${NLBASEUSER}"
+      NLBASEPASS: "${NLBASEPASS}"
+      NLVENDORURL: "${NLVENDORURL}"
+      NLVENDORUSER: "${NLVENDORUSER}"
+      NLVENDORPASS: "${NLVENDORPASS}"
+      NLVENDORKEY: "${NLVENDORKEY}"
+    ports:
+      - "6001:6001"
+      - "8080:8080"
+      - "8081:8081"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1m"
+        max-file: "2"
+
+  koha_mysql:
+    container_name: koha_mysql
+    image: mysql:5.6.20
+    networks:
+      - backend
+    cap_add:
+      - MKNOD
+    command:
+      - mysqld
+      - "--datadir=/var/lib/mysql"
+      - "--user=mysql"
+      - "--max_allowed_packet=64M"
+      - "--wait_timeout=6000"
+      - "--bind-address=0.0.0.0"
+    environment:
+      MYSQL_DATABASE: "koha_${KOHA_INSTANCE}"
+      MYSQL_PASSWORD: "${KOHA_ADMINPASS}"
+      MYSQL_ROOT_PASSWORD: "${KOHA_ADMINPASS}"
+      MYSQL_USER: "${KOHA_ADMINUSER}"
+    ports:
+      - "3306:3306"
+    volumes_from:
+      - koha_mysql_data
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1m"
+        max-file: "2"
+
+  koha_mysql_data:
+    container_name: koha_mysql_data
+    image: "busybox:latest"
+    volumes:
+      - /var/lib/mysql
+
+  sip:
+    container_name: sip_proxy
+    image: "digibib/tcp-proxy:14dc5417bf211317351a0bae084db12c64a1dd45"
+    networks:
+      - backend
+    ports:
+      - "6002:9999"
+    command:
+      - "/app/tcp-proxy"
+      - "-vv"
+      - "-r"
+      - "${HOST}:${SIP_PORT}"
+      - "-replace=(|AB)10([0-9]{14})~$$1$$2"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1m"
+        max-file: "2"
--- a/docker-compose/docker-compose-template-patched.yml
+++ b/docker-compose/docker-compose-template-patched.yml
+---
+version: '2'
+
+networks:
+  backend:
+    driver: bridge
+
+services:
+  koha_patched:
+    container_name: koha_patched
+    build:
+      context: "${KOHAPATH}/koha-patched"
+      dockerfile: Dockerfile
+    networks:
+      - backend
+    depends_on:
+      - koha_mysql
+      - sip
+    cap_add:
+      - SYS_NICE
+      - DAC_READ_SEARCH
+      - MKNOD
+    volumes:
+      - ${KOHAPATH}/koha-patched/patches:/patches
+      - ${KOHAPATH}/koha-patched/debian:/debian
+    environment:
+      KOHA_ADMINPASS: "${KOHA_ADMINPASS}"
+      KOHA_ADMINUSER: "${KOHA_ADMINUSER}"
+      KOHA_INSTANCE: "$KOHA_INSTANCE"
+      KOHA_DBHOST: koha_mysql
+      DEFAULT_LANGUAGE: nb-NO
+      EMAIL_ENABLED: "True"
+      SMTP_SERVER_HOST: mailrelay # access through network 'backend'
+      SMTP_SERVER_PORT: 2525
+      MESSAGE_QUEUE_FREQUENCY: 1
+      SMS_SERVER_HOST: "${SMS_SERVER_HOST}"
+      API_PASSPHRASE: "${API_PASSPHRASE}"
+      NLBASEUSER: "${NLBASEUSER}"
+      NLBASEPASS: "${NLBASEPASS}"
+      NLVENDORURL: "${NLVENDORURL}"
+      NLVENDORUSER: "${NLVENDORUSER}"
+      NLVENDORPASS: "${NLVENDORPASS}"
+      NLVENDORKEY: "${NLVENDORKEY}"
+    ports:
+      - "6001:6001"
+      - "8081:8081"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1m"
+        max-file: "2"
+
+  koha_mysql:
+    container_name: koha_mysql
+    image: mysql:5.6.20
+    networks:
+      - backend
+    cap_add:
+      - MKNOD
+    command:
+      - mysqld
+      - "--datadir=/var/lib/mysql"
+      - "--user=mysql"
+      - "--max_allowed_packet=64M"
+      - "--wait_timeout=6000"
+      - "--bind-address=0.0.0.0"
+    environment:
+      MYSQL_DATABASE: "koha_${KOHA_INSTANCE}"
+      MYSQL_PASSWORD: "${KOHA_ADMINPASS}"
+      MYSQL_ROOT_PASSWORD: "${KOHA_ADMINPASS}"
+      MYSQL_USER: "${KOHA_ADMINUSER}"
+    volumes_from:
+      - koha_mysql_data
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1m"
+        max-file: "2"
+
+  koha_mysql_data:
+    container_name: koha_mysql_data
+    image: "busybox:latest"
+    volumes:
+      - /var/lib/mysql
+
+  sip:
+    container_name: sip_proxy
+    image: "digibib/tcp-proxy:14dc5417bf211317351a0bae084db12c64a1dd45"
+    networks:
+      - backend
+    ports:
+      - "6002:9999"
+    command:
+      - "/app/tcp-proxy"
+      - "-vv"
+      - "-r"
+      - "${HOST}:${SIP_PORT}"
+      - "-replace=(|AB)10([0-9]{14})~$$1$$2"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1m"
+        max-file: "2"
--- a/docker-compose/docker-compose.env
+++ b/docker-compose/docker-compose.env
+export KOHA_VERSION=16.05.00+201607032205~patched
+export KOHA_IMAGE_TAG=46e687310623f649107b8c936d8150fd217ff8cf
+export KOHA_ADMINUSER=admin
+export KOHA_ADMINPASS=secret
+export KOHA_INSTANCE=name
+export SIP_IMAGE_TAG=b33e1d41f7276f122a9e969a156ecca8c2e8f6f3
+export SIP_PORT=6001
+export SIP_PROXY_PORT=6002
+export SMS_SERVER_HOST=http://smsproxy:9999
+export SMS_FORWARD_URL=tcpsink:9999
+export Z3950SECRET=replaceme
+export BS_SERVER=replace
+export BS_PORT=replaceme
+export BS_DB=replaceme
+export BS_USER=replaceme
+export BS_PASS=replacene
+export GITREF=$(git rev-parse HEAD)
+export API_PASSPHRASE=CHANGEME
+export NLBASEUSER=nlbaseuser
+export NLBASEPASS=nlbasepass
+export NLVENDORURL=https://example.com
+export NLVENDORUSER=nlvendoruser
+export NLVENDORPASS=nlvendorpass
+export NLVENDORPASS=nlvendorkey
\ No newline at end of file
--- a/kohadev/Dockerfile
+++ b/kohadev/Dockerfile
@@ -41,7 +41,7 @@ RUN mkdir -p /kohadev && cd /kohadev && \
    git clone --depth=1 $KOHA_REPO kohaclone

 # kohadev dependencies
-RUN apt-get install -y libtemplate-plugin-json-escape-perl libtext-bidi-perl \
+RUN apt-get install -y libtemplate-plugin-json-escape-perl libtext-bidi-perl libwww-csrf-perl \
    libdbix-connector-perl make libtest-warnings-perl libplack-middleware-debug-perl && \
    apt-get clean