From 0d83d18cee7d8fe1dff6d6ada0402674f99012ec Mon Sep 17 00:00:00 2001
From: Jacco van Ossenbruggen <Jacco.van.Ossenbruggen@vu.nl>
Date: Thu, 8 Apr 2021 16:59:02 +0200
Subject: [PATCH 1/3] Install composer.php dependencies

---
 dockerfiles/Dockerfile.ubuntu | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dockerfiles/Dockerfile.ubuntu b/dockerfiles/Dockerfile.ubuntu
index 146fddccb..841e08c97 100644
--- a/dockerfiles/Dockerfile.ubuntu
+++ b/dockerfiles/Dockerfile.ubuntu
@@ -68,6 +68,9 @@ WORKDIR /var/www/html
 RUN rm index.html
 
 COPY . /var/www/html
+RUN curl -sS https://getcomposer.org/installer | php
+RUN php composer.phar install --no-dev
+
 
 # Configure Skosmos
 COPY dockerfiles/config/config-docker.ttl /var/www/html/config.ttl

From a6c8837f0f5d3d37b678b5d6277d09f204ef2771 Mon Sep 17 00:00:00 2001
From: Osma Suominen <osma.suominen@helsinki.fi>
Date: Thu, 20 May 2021 10:38:28 +0300
Subject: [PATCH 2/3] Add a .dockerignore separating the Docker image contents
 from the local installation

---
 .dockerignore | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..2762a9d57
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,13 @@
+config.ttl
+build
+vendor
+report
+components
+plugins/*
+composer.phar
+composer.lock
+tests/jena-fuseki*
+.vagrant
+.project
+.DS_Store
+.phpunit.result.cache

From 046169b7b93fea81c2b41725c1e83d185857f86c Mon Sep 17 00:00:00 2001
From: Osma Suominen <osma.suominen@helsinki.fi>
Date: Thu, 20 May 2021 11:34:31 +0300
Subject: [PATCH 3/3] also ignore .git directory when building Docker images

---
 .dockerignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.dockerignore b/.dockerignore
index 2762a9d57..afda011b8 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -11,3 +11,4 @@ tests/jena-fuseki*
 .project
 .DS_Store
 .phpunit.result.cache
+.git