Skip to content

Commit

Permalink
Uses the symfony-pack image and build args can be empty
Browse files Browse the repository at this point in the history
  • Loading branch information
sroze committed Feb 3, 2018
1 parent 3fe6ef8 commit fa14b5b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions features/symfony.feature
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Feature:
When I generate the configuration files
Then the generated "Dockerfile" file should look like:
"""
FROM quay.io/continuouspipe/symfony-flex:latest
ARG APP_ENV
ARG APP_DEBUG
ARG APP_SECRET
FROM quay.io/continuouspipe/symfony-pack:latest
ARG APP_ENV=
ARG APP_DEBUG=
ARG APP_SECRET=
COPY . /app/
WORKDIR /app
RUN container build
Expand Down
4 changes: 2 additions & 2 deletions src/ConfigurationGeneration/Symfony/DockerGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ public function generate(FilesystemInterface $filesystem, array $context) : arra
}

$dockerFileLines = [
'FROM quay.io/continuouspipe/symfony-flex:latest',
'FROM quay.io/continuouspipe/symfony-pack:latest',
];

foreach ($context['env'] as $key => $value) {
$dockerFileLines[] = 'ARG '.$key;
$dockerFileLines[] = 'ARG '.$key.'=';
}

$dockerFileLines[] = 'COPY . /app/';
Expand Down

0 comments on commit fa14b5b

Please sign in to comment.