Compare commits

..

1 Commits

Author SHA1 Message Date
bb03f89057 Merge branch 'develop' into feature_cicd_fix
All checks were successful
continuous-integration/drone/push Build is passing
2021-11-23 22:28:03 +01:00
3 changed files with 2 additions and 2 deletions

BIN
scripts/.drone-build.sh.swp Normal file

Binary file not shown.

View File

@ -21,7 +21,7 @@ source_branch=$DRONE_SOURCE_BRANCH
if { contains "$branch" "feature_" && [ "$event" = push ]; } ; then if { contains "$branch" "feature_" && [ "$event" = push ]; } ; then
echo "BUILD FEATURE: $branch" echo "BUILD FEATURE: $branch"
docker build -t docker.pbiernat.dev/nginx-php:${branch} . docker build -t docker.pbiernat.dev/nginx-php:$branch .
return 0 return 0
fi fi

View File

@ -20,7 +20,7 @@ source_branch=$DRONE_SOURCE_BRANCH
docker login docker.pbiernat.dev -u $DOCKER_USERNAME -p $DOCKER_PASSWORD docker login docker.pbiernat.dev -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
if { [ "$branch" = develop ] && [ "$event" = pull_request ]; } ; then if { [ "$branch" = develop ] && [ "$event" = pull_request ]; } ; then
echo "PUSH FEATURE: ${source_branch}" echo "PUSH FEATURE: $source_branch"
docker push docker.pbiernat.dev/nginx-php:$source_branch docker push docker.pbiernat.dev/nginx-php:$source_branch
return 0 return 0
fi fi