DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #987 from JonPulsifer/bump-echoheaders

Browse source 
echoheaders: nginx-slim:0.21 and release echoserver:1.7
This commit is contained in:
Nick Sardo 2017-07-18 12:20:30 -07:00 committed by GitHub
commit 6f07f3b5f3
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
images/echoheaders/Dockerfile
View file

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM gcr.io/google_containers/nginx-slim:0.18 FROM gcr.io/google_containers/nginx-slim:0.21
ADD nginx.conf /etc/nginx/nginx.conf ADD nginx.conf /etc/nginx/nginx.conf
ADD template.lua /usr/local/share/lua/5.1/ ADD template.lua /usr/local/share/lua/5.1/

2
images/echoheaders/Makefile
View file

@ -1,7 +1,7 @@
all: push all: push
# TAG 0.0 shouldn't clobber any release builds # TAG 0.0 shouldn't clobber any release builds
TAG = 1.6 TAG = 1.7
PREFIX = gcr.io/google_containers/echoserver PREFIX = gcr.io/google_containers/echoserver
container: container: