Merge pull request #10 from localheinz/fix/install

Fix: Do not install localheinz/composer-normalize from checked-in composer.json
ergebnis · May 24, 2019 · d9ddb57 · d9ddb57
2 parents ae8f471 + 7aecd25
commit d9ddb57
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 7 deletions.
diff --git a/composer.json → .build/composer.json b/composer.json → .build/composer.json
diff --git a/composer.lock → .build/composer.lock b/composer.lock → .build/composer.lock
diff --git a/.dockerignore b/.dockerignore
@@ -1,5 +1,5 @@
+.build/
 .github/
-vendor/
 .editorconfig
 .gitattributes
 .gitignore

diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,4 @@
+/.build/            export-ignore
 /.github/           export-ignore
 /.editorconfig      export-ignore
 /.gitattributes     export-ignore

diff --git a/.gitignore b/.gitignore
@@ -1,2 +1 @@
-/.build/
 /vendor/
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,7 @@ jobs:
 
       script:
         - docker build --tag localheinz/composer-normalize-action .
-        - docker run --interactive --rm --tty --workdir=/normalizer --volume ${PWD}:/normalizer localheinz/composer-normalize-action:latest
+        - docker run --interactive --rm --tty --workdir=/normalizer --volume ${PWD}/.build:/normalizer localheinz/composer-normalize-action:latest
 
     - stage: deploy
 

diff --git a/Dockerfile b/Dockerfile
@@ -13,9 +13,7 @@ COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 ENV COMPOSER_ALLOW_SUPERUSER=1
 
-COPY composer.* /root/.composer/
-
-RUN composer global install
+RUN composer global require localheinz/composer-normalize:1.1.4
 
 ADD entrypoint.sh /entrypoint.sh
 

diff --git a/Makefile b/Makefile
@@ -4,4 +4,4 @@ it: docker
 
 docker:
 	docker build --tag localheinz/composer-normalize-action .
-	docker run --interactive --rm --tty --workdir=/normalizer --volume ${PWD}:/normalizer localheinz/composer-normalize-action:latest
+	docker run --interactive --rm --tty --workdir=/normalizer --volume ${PWD}/.build:/normalizer localheinz/composer-normalize-action:latest