From 4ea9d03dd9c19e35388539a4f0380422be38ffec Mon Sep 17 00:00:00 2001
From: Sven Speckmaier <sps@ipunkt.biz>
Date: Mon, 27 Nov 2017 11:50:20 +0100
Subject: [PATCH] changed composer requirement

---
 .dockerignore        |  1 -
 Dockerfile           |  6 ++++--
 composer.json        | 10 ++--------
 docker/composer.json | 18 ++++++++++++++++++
 4 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 docker/composer.json

diff --git a/.dockerignore b/.dockerignore
index ec05d98..13806da 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,2 @@
 Dockerfile
 .gitignore
-.git
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 4d2e7dd..09771db 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,11 +35,13 @@ RUN curl -sSL "https://github.com/rancher/rancher-compose/releases/download/v$RA
 	&& mv rancher-compose-*/rancher-compose /usr/local/bin/ \
 	&& cp /usr/local/bin/rancher-compose /usr/local/bin/rancher-compose-$RANCHER_COMPOSE_VERSION
 
-COPY [".", "/opt/rancherize"]
+COPY ["docker", "/opt/rancherize"]
+COPY [".", "/opt/rancherize-package"]
 WORKDIR /opt/rancherize
 
 # install composer packages
 RUN curl -sSL "https://gist.githubusercontent.com/justb81/1006b89e41e41e1c848fe91969af7a0b/raw/c12faf968e659356ec1cb53f313e7f8383836be3/getcomposer.sh" | sh \
-    && COMPOSER_ALLOW_SUPERUSER=1 ./composer.phar install --no-dev && rm composer.phar
+    && COMPOSER_ALLOW_SUPERUSER=1 ./composer.phar  install \
+    && rm composer.phar
 
 ENTRYPOINT ["/bin/sh", "/opt/rancherize/docker-entrypoint.sh"]
diff --git a/composer.json b/composer.json
index 6ca08bd..759ebfa 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "ipunkt/rancherize2",
+    "name": "ipunkt/rancherize",
     "description": "rancherize your development workflow",
     "keywords": ["rancher", "docker"],
     "type": "library",
@@ -22,13 +22,7 @@
         "symfony/event-dispatcher": "^3.1",
         "symfony/yaml": "^3.1",
         "pimple/pimple": "^3.0",
-        "symfony/process": "^3.1",
-        "ipunkt/rancherize-backup-storagebox": "dev-gvvs-update@dev as 1.1.0",
-        "ipunkt/rancherize-ecr": "^1.0.0",
-        "ipunkt/rancherize-publish-traefik-rancher": "^1.0.2",
-        "ipunkt/rancherize-blueprint-php-cli": "^1.0.1",
-        "ipunkt/rancherize-php53": "^1.1.0",
-        "ipunkt/rancherize": "^2.18.7"
+        "symfony/process": "^3.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.6",
diff --git a/docker/composer.json b/docker/composer.json
new file mode 100644
index 0000000..e6d257c
--- /dev/null
+++ b/docker/composer.json
@@ -0,0 +1,18 @@
+{
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "/opt/rancherize-package"
+    }
+  ],
+  "require": {
+    "ipunkt/rancherize": "dev-gvvs-update",
+    "ipunkt/rancherize-backup-storagebox": "dev-gvvs-update",
+    "ipunkt/rancherize-ecr": "^1.0.0",
+    "ipunkt/rancherize-publish-traefik-rancher": "^1.0.1",
+    "ipunkt/rancherize-blueprint-php-cli": "^1.0.1",
+    "ipunkt/rancherize-php53": "^1.1.0"
+  },
+  "minimum-stability": "dev",
+  "prefer-stable": true
+}