From 46eef33d0ac0cd45831e0c391b066111440a3bbb Mon Sep 17 00:00:00 2001
From: eldadfux <eldad.fux@gmail.com>
Date: Wed, 20 Nov 2019 06:55:39 +0200
Subject: [PATCH] Reverted build changes

---
 .travis.yml | 16 ++++++++--------
 Dockerfile  |  8 +-------
 build.sh    |  4 ++++
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1567b58232..f94f137c7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,21 +14,21 @@ notifications:
 services:
 - docker
 
-cache:
-  directories:
-  - docker_images
+# cache:
+#   directories:
+#   - docker_images
 
 before_install:
-- docker load -i docker_images/images.tar || true
+- composer update --ignore-platform-reqs --optimize-autoloader --no-plugins --no-scripts
 - sudo service mysql stop
 
-before_cache:
-- docker save -o docker_images/images.tar $(docker images -a -q)
+# before_cache:
+# - docker save -o docker_images/images.tar $(docker images -a -q)
 
 install:
 - docker-compose -f tests/resources/docker-compose.yml up -d
-- sleep 180
+# - sleep 180
 
 script:
 - docker ps
-- phpunit
+- vendor/bin/phpunit --configuration phpunit.xml
diff --git a/Dockerfile b/Dockerfile
index d664ce1535..2dea6b0770 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,3 @@
-FROM composer/composer:php7 as vendor
-WORKDIR /builder
-COPY composer.json composer.json
-COPY composer.lock composer.lock
-RUN composer update --ignore-platform-reqs --optimize-autoloader --no-plugins --no-scripts
-
 FROM ubuntu:18.04
 LABEL maintainer="team@appwrite.io"
 
@@ -86,7 +80,7 @@ COPY ./app /usr/share/nginx/html/app
 COPY ./docs /usr/share/nginx/html/docs
 COPY ./public /usr/share/nginx/html/public
 COPY ./src /usr/share/nginx/html/src
-COPY --from=vendor /builder/vendor /usr/share/nginx/html/vendor
+COPY ./vendor /usr/share/nginx/html/vendor
 
 WORKDIR /storage/uploads
 RUN chown -Rf www-data.www-data /storage/uploads && chmod -Rf 0755 /storage/uploads
diff --git a/build.sh b/build.sh
index a9367e85dd..b3be98262e 100644
--- a/build.sh
+++ b/build.sh
@@ -17,6 +17,10 @@ echo "Setting Version #"
 
 echo -e "<?php\n\nconst VERSION = '$1';\n\nreturn VERSION;" > app/config/version.php
 
+echo 'Updating PHP dependencies and auto-loading...'
+
+composer update --ignore-platform-reqs --optimize-autoloader --no-dev --no-plugins --no-scripts --prefer-dist
+
 echo 'Starting build...'
 
 docker build -t appwrite/appwrite:"$1" .