Skip to content

Commit

Permalink
refactor: move index.php file
Browse files Browse the repository at this point in the history
  • Loading branch information
PedroTroller committed Nov 4, 2020
1 parent 1b044be commit 308ea64
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 14 deletions.
3 changes: 2 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
*

!/Gemfile*
!/behat.yaml.dist
!/composer*
!/features/
!/index.php
!/html/
!/package*
2 changes: 1 addition & 1 deletion .php_cs.dist
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ return PhpCsFixer\Config::create()
->registerCustomFixers(new Fixers())
->setFinder(
PhpCsFixer\Finder::create()
->in(__DIR__)
->in(__DIR__ . '/html')
->append([__FILE__])
)
;
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ RUN echo en_US.UTF-8 UTF-8 > /etc/locale.gen && \
locale -a

ENV LANG=en_US.UTF-8
ENV PATH /var/www/html/node_modules/.bin:$PATH
ENV PATH /var/www/node_modules/.bin:$PATH

WORKDIR /var/www/html
WORKDIR /var/www

COPY Gemfile* /var/www/html/
COPY composer.* /var/www/html/
COPY package* /var/www/html/
COPY Gemfile* /var/www/
COPY composer.* /var/www/
COPY package* /var/www/

RUN bundler install --jobs $(($(nproc) * 2)) \
&& composer install --no-scripts --no-dev \
&& npm install

COPY . /var/www/html
COPY . /var/www

########################################

Expand Down
11 changes: 6 additions & 5 deletions behat.yaml.dist
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
default:
suites:
default:
contexts:
- FeatureContext:
host: "http://prod/"
suites:
default:
contexts:
- FeatureContext:
host: "http://prod/"
2 changes: 1 addition & 1 deletion index.php → html/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use React\Promise\Deferred;
use React\Promise\Promise;

require_once __DIR__.'/vendor/autoload.php';
require_once dirname(__DIR__).'/vendor/autoload.php';

$app = new App();

Expand Down

0 comments on commit 308ea64

Please sign in to comment.