Skip to content

Commit

Permalink
Merge pull request #4746 from nanasess/fixed-composer1
Browse files Browse the repository at this point in the history
Dockerfile は Composer1 に固定
  • Loading branch information
okazy authored Oct 27, 2020
2 parents 8732649 + 9690879 commit 61ce507
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ jobs:
${{ runner.os }}-composer-
- name: Install to Composer
run: composer install --no-scripts --no-dev --no-interaction --optimize-autoloader
run: |
sudo composer selfupdate --1
composer install --no-scripts --no-dev --no-interaction --optimize-autoloader
- name: Translate to templates
run: php bin/template_jp.php
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ jobs:
php-version: ${{ matrix.php }}

- name: composer install
run: composer install --dev --no-interaction -o --apcu-autoloader
run: |
sudo composer selfupdate --1
composer install --dev --no-interaction -o --apcu-autoloader
- name: Setup to EC-CUBE
env:
APP_ENV: ${{ matrix.app_env }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/plugin-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ jobs:
php-version: ${{ matrix.php }}

- name: composer install
run: composer install --dev --no-interaction -o --apcu-autoloader
run: |
sudo composer selfupdate --1
composer install --dev --no-interaction -o --apcu-autoloader
- name: Setup to EC-CUBE
env:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ jobs:
php-version: ${{ matrix.php }}

- name: composer install
run: composer install --dev --no-interaction -o --apcu-autoloader
run: |
sudo composer selfupdate --1
composer install --dev --no-interaction -o --apcu-autoloader
- name: Setup EC-CUBE
env:
Expand Down
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,12 @@ package_api_setup: &package_api_setup |
mkdir ${PWD}/repos
docker run -d --rm -v ${PWD}/repos:/repos -e MOCK_REPO_DIR=/repos -p 8080:8080 eccube/mock-package-api

composer_install: &composer_install |
composer selfupdate --1
composer install --dev --no-interaction -o --apcu-autoloader

install:
- &composer_install composer install --dev --no-interaction -o --apcu-autoloader
- *composer_install
- echo "APP_ENV=test" > .env
- *eccube_setup

Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ WORKDIR ${APACHE_DOCUMENT_ROOT}
RUN curl -sS https://getcomposer.org/installer \
| php \
&& mv composer.phar /usr/bin/composer \
&& composer selfupdate --1 \
&& composer config -g repos.packagist composer https://packagist.jp \
&& composer global require hirak/prestissimo \
&& chown www-data:www-data /var/www \
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ install:
- echo memory_limit = 512M >> C:\tools\php72\php.ini
- echo APP_ENV=codeception >> .env
- php -r "readfile('http://getcomposer.org/installer');" | php
- php composer.phar selfupdate --1
- php composer.phar install --dev --no-interaction -o

# Don't actually build.
Expand Down

0 comments on commit 61ce507

Please sign in to comment.