Skip to content

Commit

Permalink
updates php from 7.0 to 7.2
Browse files Browse the repository at this point in the history
* would require additional setup to build more than 2 versions on semaphore co

NOTE

* php 5.6 requires jessie as base image
** openssl/openssl#4133
  • Loading branch information
encodeering committed Jan 6, 2018
1 parent 4e961b9 commit eeefd5a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ env:
- PROJECT="php"
- REPOSITORY="encodeering"
- BRANCH="$TRAVIS_BRANCH"
- COMMIT="287a157544a8e43032ecb2879ff778d10c0d0e37"
- COMMIT="f4baf0edbc4e05e241938c68bcc7c9635707583d"
matrix:
- ARCH=amd64 VERSION=5.6 VARIANT=apache
- ARCH=amd64 VERSION=7.0 VARIANT=apache
- ARCH=amd64 VERSION=7.2 VARIANT=apache

install:
- bash <(curl https://raw.githubusercontent.com/encodeering/docker-ci/master/install.sh) 0.1.4
Expand Down
9 changes: 7 additions & 2 deletions modules/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ set -e
import com.encodeering.docker.config
import com.encodeering.docker.docker

docker-pull "$REPOSITORY/debian-$ARCH:jessie" "debian:jessie"
case "$VERSION" in
7.2) FROM=stretch ;;
*) FROM=jessie ;;
esac

docker build -t "$DOCKER_IMAGE" "$PROJECT/$VERSION/jessie/$VARIANT"
docker-pull "$REPOSITORY/debian-$ARCH:$FROM" "debian:$FROM"

docker build -t "$DOCKER_IMAGE" "$PROJECT/$VERSION/$FROM/$VARIANT"

docker run --rm "$DOCKER_IMAGE" php -v

0 comments on commit eeefd5a

Please sign in to comment.