Commit fb018d7f authored by Tobias Munk's avatar Tobias Munk

fixed local build without ENV variable for image tag set

parent ba32411f
...@@ -8,7 +8,8 @@ DOCKER_COMPOSE ?= docker-compose ...@@ -8,7 +8,8 @@ DOCKER_COMPOSE ?= docker-compose
PHP_SERVICE ?= php PHP_SERVICE ?= php
WEB_SERVICE ?= nginx 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) UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S), Darwin) ifeq ($(UNAME_S), Darwin)
......
...@@ -17,7 +17,7 @@ services: ...@@ -17,7 +17,7 @@ services:
aliases: aliases:
- web - web
tester: tester:
image: local/phd/app:${BUILD_PREFIX} image: local/phd/app${IMAGE_TAG}
depends_on: depends_on:
- seleniumfirefox - seleniumfirefox
volumes: volumes:
......
...@@ -31,7 +31,7 @@ docker-compose run --rm php composer show -i || EXIT_CODE=1 ...@@ -31,7 +31,7 @@ docker-compose run --rm php composer show -i || EXIT_CODE=1
docker-compose run --rm php climb || EXIT_CODE=1 docker-compose run --rm php climb || EXIT_CODE=1
# PHP source # 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 phpcpd src/
docker run --rm -v "${PWD}:/project" jolicode/phaudit phploc src/ > tests/_lint/loc.txt 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 run --rm -v "${PWD}:/project" jolicode/phaudit phpmd src html cleancode,codesize,controversial,design,naming,unusedcode > tests/_lint/mess.html
......
...@@ -4,7 +4,7 @@ version: '2' ...@@ -4,7 +4,7 @@ version: '2'
services: services:
php: php:
build: . build: .
image: local/phd/app:${BUILD_PREFIX} image: local/phd/app${IMAGE_TAG}
depends_on: depends_on:
- db - db
networks: networks:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment