diff options
| author |  kpayson64 <kpayson@google.com> | 2017-05-16 08:44:27 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-05-16 08:44:27 -0700 |
| commit | 3634fbe874affaf6eaee938486352895530b32c0 (patch) | |
| tree | 94fb6e0c114d435df4d3121a4a38bb341e036524 | |
| parent | 6b7f893b58d5966c46190ca55bdac032095ed7cd (diff) | |
| parent | 4ba230383362b8a06a2376cecf3841224a36a2af (diff) | |
Merge pull request #10800 from kpayson64/fix_alpine
Fix alpine build
| -rw-r--r-- | src/core/lib/channel/channel_args.c | 2 | ||||
| -rw-r--r-- | tools/dockerfile/test/cxx_alpine_x64/Dockerfile | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/core/lib/channel/channel_args.c b/src/core/lib/channel/channel_args.c index 238d176dfa..247b134938 100644 --- a/src/core/lib/channel/channel_args.c +++ b/src/core/lib/channel/channel_args.c @@ -31,6 +31,8 @@ * */ +#include <grpc/support/port_platform.h> + #include <limits.h> #include <string.h> diff --git a/tools/dockerfile/test/cxx_alpine_x64/Dockerfile b/tools/dockerfile/test/cxx_alpine_x64/Dockerfile index f9468757da..b13157f280 100644 --- a/tools/dockerfile/test/cxx_alpine_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_alpine_x64/Dockerfile @@ -27,7 +27,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -FROM alpine:3.3 +FROM alpine:3.5 # Install Git and basic packages. RUN apk update && apk add \ |