From 48f540bdedaa89e67f78f10cd5282a0285103114 Mon Sep 17 00:00:00 2001
From: Julien Cabillot <gitlab@cabillot.eu>
Date: Wed, 1 Nov 2017 12:19:17 +0000
Subject: [PATCH 1/2] Add .gitlab-ci.yml

---
 .gitlab-ci.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..2c562ae
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,23 @@
+image: docker:latest
+
+services:
+  - docker:dind
+
+before_script:
+  - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+
+build-master:
+  stage: build
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE" .
+    - docker push "$CI_REGISTRY_IMAGE"
+  only:
+    - master
+
+build:
+  stage: build
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
+    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+  except:
+    - master

From 6a28c9a80e89427000a730e43b3bfa3469c22fa0 Mon Sep 17 00:00:00 2001
From: Julien Cabillot <gitlab@cabillot.eu>
Date: Wed, 1 Nov 2017 12:41:29 +0000
Subject: [PATCH 2/2] Ajout du git clone dans le dockerfile pour le -ci

---
 Dockerfile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b4bb663..5f0bdbc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,19 @@
-FROM php:apache
+FROM "php:apache"
 
+WORKDIR "/var/www"
 RUN apt-get update && \
-    apt-get -y install libpng12-dev && \
+    apt-get -y install libpng12-dev git && \
     docker-php-ext-install gd && \
     apt-get clean all && \
     a2enmod headers && \
+    git clone "https://github.com/blueimp/jQuery-File-Upload.git" && \
+    rm -rf "/var/www/html" && \
+    ln -s "jQuery-File-Upload" "html" && \
     rm -rf /usr/share/doc/* \
            /var/cache/* \
            /var/lib/apt/lists/*
 
-COPY src/ /var/www/html/
-RUN chown -R www-data:www-data /var/www/html/
+RUN chown -R "www-data":"www-data" "/var/www/jQuery-File-Upload/"
 
 HEALTHCHECK --interval=10s \
     CMD curl --fail "http://localhost" || exit 1
\ No newline at end of file