Skip to content

Commit 68cfcde

Browse files
committed
Update docker-push mechanism to use Travis' deployment mechanism.
1 parent 2da56a4 commit 68cfcde

File tree

2 files changed

+28
-24
lines changed

2 files changed

+28
-24
lines changed

.travis.yml

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,8 @@ script:
2525
- docker exec php-apache php -v | grep ${php_version}
2626
- curl http://localhost:8080/
2727

28-
after_success:
29-
- |
30-
if [[ "$TRAVIS_BRANCH" == "master" ]]; then
31-
# Log into Docker Hub.
32-
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
33-
34-
# Push $php_version tag.
35-
docker push geerlingguy/php-apache:${php_version}
36-
37-
# Push $php_version + '.x' tag.
38-
docker tag geerlingguy/php-apache:${php_version} geerlingguy/php-apache:${php_version}.x
39-
docker push geerlingguy/php-apache:${php_version}.x
40-
41-
# Push $php_version + '.PHP_RELEASE_VERSION' tag.
42-
php_release_version=$(docker run --rm geerlingguy/php-apache:${php_version} bash -c "php -r 'echo PHP_RELEASE_VERSION;'")
43-
docker tag geerlingguy/php-apache:${php_version} geerlingguy/php-apache:${php_version}.${php_release_version}
44-
docker push geerlingguy/php-apache:${php_version}.${php_release_version}
45-
46-
# Push latest tag if building latest version.
47-
if [[ "$php_version" == "7.3" ]]; then
48-
docker tag geerlingguy/php-apache:${php_version} geerlingguy/php-apache:latest
49-
docker push geerlingguy/php-apache:latest
50-
fi
51-
fi
28+
deploy:
29+
provider: script
30+
script: bash docker-push
31+
on:
32+
branch: master

docker-push

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/bin/bash
2+
# Push container image to geerlingguy.php-apache Docker Hub repository.
3+
4+
# Log into Docker Hub.
5+
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
6+
7+
# Push $php_version tag.
8+
docker push geerlingguy/php-apache:${php_version}
9+
10+
# Push $php_version + '.x' tag.
11+
docker tag geerlingguy/php-apache:${php_version} geerlingguy/php-apache:${php_version}.x
12+
docker push geerlingguy/php-apache:${php_version}.x
13+
14+
# Push $php_version + '.PHP_RELEASE_VERSION' tag.
15+
php_release_version=$(docker run --rm geerlingguy/php-apache:${php_version} bash -c "php -r 'echo PHP_RELEASE_VERSION;'")
16+
docker tag geerlingguy/php-apache:${php_version} geerlingguy/php-apache:${php_version}.${php_release_version}
17+
docker push geerlingguy/php-apache:${php_version}.${php_release_version}
18+
19+
# Push latest tag if building latest version.
20+
if [[ "$php_version" == "7.3" ]]; then
21+
docker tag geerlingguy/php-apache:${php_version} geerlingguy/php-apache:latest
22+
docker push geerlingguy/php-apache:latest
23+
fi

0 commit comments

Comments
 (0)