Skip to content

Commit ef47041

Browse files
author
Koki Yasuda
authored
Merge pull request #1 from orleika/devel
Update
2 parents 1bd47e6 + b338ff4 commit ef47041

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ sudo: required
55
branches:
66
only:
77
- master
8+
- devel
89

910
services:
1011
- docker

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM alpine:3.4
22

33
MAINTAINER orleika <orleika.net@gmail.com>
44

5-
ARG NGINX_VERSION=1.11.7
6-
ARG LIBRESSL_VERSION=2.4.4
5+
ARG NGINX_VERSION=1.11.9
6+
ARG LIBRESSL_VERSION=2.5.1
77
ARG GPG_LIBRESSL="A1EB 079B 8D3E B92B 4EBD 3139 663A F51B D5E4 D8D5"
88
ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4 2178 520A 9993 A1C0 52F8"
99

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
COPYRIGHT (c) 2016 orleika
1+
COPYRIGHT (c) 2017 orleika
22

33
MIT License
44

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
[![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://orleika.github.io/mit-license)
44
[![Build Status](https://img.shields.io/travis/orleika/docker-nginx/master.svg?style=flat-square)](https://travis-ci.org/orleika/docker-nginx)
5-
[![nginx](http://img.shields.io/badge/nginx-v1.11.7-blue.svg?style=flat-square)](https://nginx.org/en/download.html)
6-
[![LibreSSL](http://img.shields.io/badge/LibreSSL-v2.4.4-blue.svg?style=flat-square)](https://www.libressl.org/)
5+
[![nginx](http://img.shields.io/badge/nginx-v1.11.9-blue.svg?style=flat-square)](https://nginx.org/en/download.html)
6+
[![LibreSSL](http://img.shields.io/badge/LibreSSL-v2.5.1-blue.svg?style=flat-square)](https://www.libressl.org/)
77

88
> nginx docker image
99

0 commit comments

Comments
 (0)