Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

Commit 087305b

Browse files
authored
Merge pull request #14 from juanjux/feature/alpine37
Alpine 3.7 + Go 1.9. Removed unneeded dependency.
2 parents 1178387 + 13f8004 commit 087305b

File tree

6 files changed

+6
-20
lines changed

6 files changed

+6
-20
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: go
22

33
go:
4-
- 1.8
4+
- 1.9
55

66
services:
77
- docker

Dockerfile.build.tpl

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.5
1+
FROM alpine:3.7
22

33
RUN mkdir -p /opt/driver/src && \
44
adduser ${BUILD_USER} -u ${BUILD_UID} -D -h /opt/driver/src
@@ -9,10 +9,7 @@ RUN echo "http://php.codecasts.rocks/v3.5/php-7.1" >> /etc/apk/repositories
99
RUN apk add --no-cache make git ca-certificates \
1010
php7=${RUNTIME_NATIVE_VERSION} \
1111
php7-openssl php7-zlib php7-mbstring php7-json php7-phar php7-ctype \
12-
php7-xml php7-xdebug php7-dom
13-
14-
RUN ln -s /usr/bin/php7 /usr/bin/php
15-
12+
php7-xml php7-dom php7-tokenizer php7-xmlwriter
1613

1714
# PHP composer installation
1815
ADD https://getcomposer.org/installer /tmp/composer-setup.php

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# php-driver ![Driver Status](https://img.shields.io/badge/status-beta-dbd25c.svg) [![Build Status](https://travis-ci.org/bblfsh/php-driver.svg?branch=master)](https://travis-ci.org/bblfsh/php-driver) ![Native Version](https://img.shields.io/badge/php%20version-7.1.7--r0-aa93ea.svg) ![Go Version](https://img.shields.io/badge/go%20version-1.8-63afbf.svg)
1+
# php-driver ![Driver Status](https://img.shields.io/badge/status-beta-dbd25c.svg) [![Build Status](https://travis-ci.org/bblfsh/php-driver.svg?branch=master)](https://travis-ci.org/bblfsh/php-driver) ![Native Version](https://img.shields.io/badge/php%20version-7.1.15--r0-aa93ea.svg) ![Go Version](https://img.shields.io/badge/go%20version-1.9-63afbf.svg)
22

33
php driver for [babelfish](https://github.com/bblfsh/bblfshd).
44

manifest.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ php driver for [babelfish](https://github.com/bblfsh/bblfshd).
2525
os = "alpine"
2626

2727
# go_version describes the version being use to build the driver Go code.
28-
go_version = "1.8"
28+
go_version = "1.9"
2929

3030
# native_version describes the version or versions being use to build and
3131
# execute the native code, you should define at least one. (eg.: "1.8").
32-
native_version = ["7.1.7-r0"]
32+
native_version = ["7.1.15-r0"]

native/composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"nikic/php-parser": "3.1.2"
2828
},
2929
"require-dev": {
30-
"ext-xdebug" : "@stable",
3130
"phpmd/phpmd" : "@stable",
3231
"phpunit/phpunit": "@stable"
3332
}

native/composer.lock

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)