Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add an nginx docker image for use on the master. #6334

Merged
merged 1 commit into from
Apr 2, 2015
Merged

Add an nginx docker image for use on the master. #6334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions cluster/images/nginx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM google/debian:wheezy

COPY backports.list /etc/apt/sources.list.d/backports.list

RUN apt-get update
RUN apt-get -t wheezy-backports -yy -q install nginx
14 changes: 14 additions & 0 deletions cluster/images/nginx/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
### Nginx image
# This image is used to run nginx on the master.

# Current 'live' version is v1
# Please make sure that you update this comment if you build/push new
# versions.
VERSION=v2

all:
docker build -t gcr.io/google_containers/nginx:${VERSION} .
gcloud preview docker push gcr.io/google_containers/nginx:${VERSION}

.PHONY: all

7 changes: 7 additions & 0 deletions cluster/images/nginx/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
### Nginx image
This image is used to run nginx on the master.

#### Instructions
make


1 change: 1 addition & 0 deletions cluster/images/nginx/backports.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
deb http://gce_debian_mirror.storage.googleapis.com wheezy-backports main non-free
26 changes: 26 additions & 0 deletions cluster/saltbase/salt/nginx/init.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,30 @@ nginx:
- group: root
- mode: 644

{% if grains.cloud in ['gce'] %}
/etc/kubernetes/manifests/nginx.json:
file:
- managed
- source: salt://nginx/nginx.json
- user: root
- group: root
- mode: 644
- require:
- file: /etc/nginx/nginx.conf
- file: /etc/nginx/sites-enabled/default
- file: /usr/share/nginx/htpasswd
- cmd: kubernetes-cert


#stop legacy nginx_service
stop_nginx-service:
service.dead:
- name: nginx
- enable: None
- watch:
- file: /etc/kubernetes/manifests/nginx.json

{% else %}
nginx-service:
service:
- running
Expand All @@ -38,3 +62,5 @@ nginx-service:
- file: /etc/nginx/sites-enabled/default
- file: /usr/share/nginx/htpasswd
- cmd: kubernetes-cert
{% endif %}

55 changes: 55 additions & 0 deletions cluster/saltbase/salt/nginx/nginx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"apiVersion": "v1beta3",
"kind": "Pod",
"metadata": {"name":"nginx"},
"spec":{
"hostNetwork": true,
"containers":[
{
"name": "nginx",
"image": "gcr.io/google-containers/nginx:v1",
"command": [
"nginx",
"-g",
"daemon off;"
],
"ports":[
{ "name": "https",
"containerPort": 443,
"hostPort": 443}
],
"volumeMounts": [
{ "name": "nginx",
"mountPath": "/etc/nginx",
"readOnly": true},
{ "name": "k8s",
"mountPath": "/srv/kubernetes",
"readOnly": true},
{ "name": "logs",
"mountPath": "/var/log/nginx",
"readOnly": false},
{ "name": "passwd",
"mountPath": "/usr/share/nginx",
"readOnly": true}
]
}
],
"volumes":[
{ "name": "nginx",
"hostPath": {
"path": "/etc/nginx"}
},
{ "name": "k8s",
"hostPath": {
"path": "/srv/kubernetes"}
},
{ "name": "passwd",
"hostPath": {
"path": "/usr/share/nginx"}
},
{ "name": "logs",
"hostPath": {
"path": "/var/logs/nginx"}
}
]
}}