Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
app
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
phundament
app
Commits
fb018d7f
Commit
fb018d7f
authored
Apr 04, 2016
by
Tobias Munk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed local build without ENV variable for image tag set
parent
ba32411f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
Makefile
Makefile
+2
-1
test.override.yml
build/compose/test.override.yml
+1
-1
lint.sh
build/scripts/lint.sh
+1
-1
docker-compose.yml
docker-compose.yml
+1
-1
No files found.
Makefile
View file @
fb018d7f
...
...
@@ -8,7 +8,8 @@ DOCKER_COMPOSE ?= docker-compose
PHP_SERVICE
?=
php
WEB_SERVICE
?=
nginx
export
BUILD_PREFIX
?=
$(
shell
echo
$
(
notdir
$(PWD))
|
tr
-dc
'[:alnum:]\n\r'
|
tr
'[:upper:]'
'[:lower:]'
)
export
BUILD_PREFIX
?=
$(
shell
echo
$
(
notdir
$(PWD))
|
tr
-dc
'[:alnum:]\n\r'
|
tr
'[:upper:]'
'[:lower:]'
)
export
IMAGE_TAG
?=
:
$(BUILD_PREFIX)
UNAME_S
:=
$(
shell
uname
-s
)
ifeq
($(UNAME_S),
Darwin)
...
...
build/compose/test.override.yml
View file @
fb018d7f
...
...
@@ -17,7 +17,7 @@ services:
aliases
:
-
web
tester
:
image
:
local/phd/app
:${BUILD_PREFIX
}
image
:
local/phd/app
${IMAGE_TAG
}
depends_on
:
-
seleniumfirefox
volumes
:
...
...
build/scripts/lint.sh
View file @
fb018d7f
...
...
@@ -31,7 +31,7 @@ docker-compose run --rm php composer show -i || EXIT_CODE=1
docker-compose run
--rm
php climb
||
EXIT_CODE
=
1
# PHP source
docker-compose run
--rm
php vendor/bin/php-cs-fixer fix
--
dry-run
--format
=
txt
-v
src
||
EXIT_CODE
=
1
docker-compose run
--rm
php vendor/bin/php-cs-fixer fix
--
format
=
txt
-v
--dry-run
src
||
EXIT_CODE
=
1
docker run
--rm
-v
"
${
PWD
}
:/project"
jolicode/phaudit phpcpd src/
docker run
--rm
-v
"
${
PWD
}
:/project"
jolicode/phaudit phploc src/
>
tests/_lint/loc.txt
docker run
--rm
-v
"
${
PWD
}
:/project"
jolicode/phaudit phpmd src html cleancode,codesize,controversial,design,naming,unusedcode
>
tests/_lint/mess.html
...
...
docker-compose.yml
View file @
fb018d7f
...
...
@@ -4,7 +4,7 @@ version: '2'
services
:
php
:
build
:
.
image
:
local/phd/app
:${BUILD_PREFIX
}
image
:
local/phd/app
${IMAGE_TAG
}
depends_on
:
-
db
networks
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment