Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 4ea9d03

Browse files
author
Sven Speckmaier
committed
changed composer requirement
1 parent 7ac89aa commit 4ea9d03

File tree

4 files changed

+24
-11
lines changed

4 files changed

+24
-11
lines changed

.dockerignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
Dockerfile
22
.gitignore
3-
.git

Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,13 @@ RUN curl -sSL "https://github.com/rancher/rancher-compose/releases/download/v$RA
3535
&& mv rancher-compose-*/rancher-compose /usr/local/bin/ \
3636
&& cp /usr/local/bin/rancher-compose /usr/local/bin/rancher-compose-$RANCHER_COMPOSE_VERSION
3737

38-
COPY [".", "/opt/rancherize"]
38+
COPY ["docker", "/opt/rancherize"]
39+
COPY [".", "/opt/rancherize-package"]
3940
WORKDIR /opt/rancherize
4041

4142
# install composer packages
4243
RUN curl -sSL "https://gist.githubusercontent.com/justb81/1006b89e41e41e1c848fe91969af7a0b/raw/c12faf968e659356ec1cb53f313e7f8383836be3/getcomposer.sh" | sh \
43-
&& COMPOSER_ALLOW_SUPERUSER=1 ./composer.phar install --no-dev && rm composer.phar
44+
&& COMPOSER_ALLOW_SUPERUSER=1 ./composer.phar install \
45+
&& rm composer.phar
4446

4547
ENTRYPOINT ["/bin/sh", "/opt/rancherize/docker-entrypoint.sh"]

composer.json

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "ipunkt/rancherize2",
2+
"name": "ipunkt/rancherize",
33
"description": "rancherize your development workflow",
44
"keywords": ["rancher", "docker"],
55
"type": "library",
@@ -22,13 +22,7 @@
2222
"symfony/event-dispatcher": "^3.1",
2323
"symfony/yaml": "^3.1",
2424
"pimple/pimple": "^3.0",
25-
"symfony/process": "^3.1",
26-
"ipunkt/rancherize-backup-storagebox": "dev-gvvs-update@dev as 1.1.0",
27-
"ipunkt/rancherize-ecr": "^1.0.0",
28-
"ipunkt/rancherize-publish-traefik-rancher": "^1.0.2",
29-
"ipunkt/rancherize-blueprint-php-cli": "^1.0.1",
30-
"ipunkt/rancherize-php53": "^1.1.0",
31-
"ipunkt/rancherize": "^2.18.7"
25+
"symfony/process": "^3.1"
3226
},
3327
"require-dev": {
3428
"phpunit/phpunit": "^5.6",

docker/composer.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"repositories": [
3+
{
4+
"type": "vcs",
5+
"url": "/opt/rancherize-package"
6+
}
7+
],
8+
"require": {
9+
"ipunkt/rancherize": "dev-gvvs-update",
10+
"ipunkt/rancherize-backup-storagebox": "dev-gvvs-update",
11+
"ipunkt/rancherize-ecr": "^1.0.0",
12+
"ipunkt/rancherize-publish-traefik-rancher": "^1.0.1",
13+
"ipunkt/rancherize-blueprint-php-cli": "^1.0.1",
14+
"ipunkt/rancherize-php53": "^1.1.0"
15+
},
16+
"minimum-stability": "dev",
17+
"prefer-stable": true
18+
}

0 commit comments

Comments
 (0)