docker/nginx-php
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge develop #20

Merged
keedosn merged 26 commits from develop into master 2021-11-23 23:17:16 +01:00
Conversation 0 Commits 26 Files Changed 5 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f254ef8eba - Show all commits

4
scripts/drone-build.sh
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
@ -31,7 +31,7 @@ if { [ "$branch" = develop ] && [ "$event" = pull_request ]; } ; then
return 0 return 0
fi fi
if { [ "$branch" = develop ] && [ "$event" = push ]; } ; then if { [ "$branch" = develop ] && [ "$event" = push ] && [ "$step_name" != build_feature ]; } ; then
echo "BUILD DEV" echo "BUILD DEV"
docker build -t docker.pbiernat.dev/nginx-php:dev . docker build -t docker.pbiernat.dev/nginx-php:dev .
return 0 return 0

2
scripts/drone-publish.sh
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