From 08c42c84864ab16e30765370adaf8d6f5617ddf0 Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Tue, 8 Mar 2016 19:44:47 -0300 Subject: [PATCH] Change docker images location --- images/haproxy/Dockerfile | 30 ------ images/haproxy/Makefile | 16 --- images/haproxy/README.md | 18 ---- images/haproxy/haproxy.cfg | 36 ------- images/haproxy/pod.yaml | 17 ---- images/nginx-slim/Dockerfile | 29 ------ images/nginx-slim/Makefile | 14 --- images/nginx-slim/README.md | 24 ----- images/nginx-slim/build.sh | 185 ----------------------------------- images/nginx-slim/rc.yaml | 34 ------- 10 files changed, 403 deletions(-) delete mode 100644 images/haproxy/Dockerfile delete mode 100644 images/haproxy/Makefile delete mode 100644 images/haproxy/README.md delete mode 100644 images/haproxy/haproxy.cfg delete mode 100644 images/haproxy/pod.yaml delete mode 100644 images/nginx-slim/Dockerfile delete mode 100644 images/nginx-slim/Makefile delete mode 100644 images/nginx-slim/README.md delete mode 100755 images/nginx-slim/build.sh delete mode 100644 images/nginx-slim/rc.yaml diff --git a/images/haproxy/Dockerfile b/images/haproxy/Dockerfile deleted file mode 100644 index a282d3cdc..000000000 --- a/images/haproxy/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2015 The Kubernetes Authors. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -FROM gcr.io/google_containers/ubuntu-slim:0.1 -MAINTAINER Prashanth B - -RUN apt-get update && apt-get install -y --no-install-recommends \ - bash curl socat haproxy ca-certificates && \ - apt-get clean -y && \ - rm -rf /var/lib/apt/lists/* - -RUN mkdir -p /etc/haproxy/errors /var/state/haproxy -RUN for ERROR_CODE in 400 403 404 408 500 502 503 504;do curl -sSL -o /etc/haproxy/errors/$ERROR_CODE.http \ - https://raw.githubusercontent.com/haproxy/haproxy-1.5/master/examples/errorfiles/$ERROR_CODE.http;done - -ADD haproxy.cfg /etc/haproxy/haproxy.cfg - -CMD ["/usr/sbin/haproxy", "-db", "-f", "/etc/haproxy/haproxy.cfg"] diff --git a/images/haproxy/Makefile b/images/haproxy/Makefile deleted file mode 100644 index 1e3361e15..000000000 --- a/images/haproxy/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -all: push - -# 0.0.0 shouldn't clobber any released builds -TAG = 0.2 -PREFIX = gcr.io/google_containers/haproxy -HAPROXY_IMAGE = haproxy - -container: - docker build -t $(PREFIX):$(TAG) . - -push: container - gcloud docker push $(PREFIX):$(TAG) - -clean: - # remove haproxy images - docker rmi -f $(PREFIX):$(TAG) || true diff --git a/images/haproxy/README.md b/images/haproxy/README.md deleted file mode 100644 index dbf991637..000000000 --- a/images/haproxy/README.md +++ /dev/null @@ -1,18 +0,0 @@ - -HAProxy 1.6 base image using alpine linux - -What is HAProxy? -HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. - -**How to use this image:** -This image does provides a default configuration file with no backend servers. - -*Using docker* -``` -$ docker run -v /some/haproxy.cfg:/etc/haproxy/haproxy.cfg:ro gcr.io/google_containers/haproxy:0.2 -``` - -*Creating a pod* -``` -$ kubectl create -f ./pod.yaml -``` diff --git a/images/haproxy/haproxy.cfg b/images/haproxy/haproxy.cfg deleted file mode 100644 index a69a837a6..000000000 --- a/images/haproxy/haproxy.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# Default haproxy config file. -global - daemon - stats socket /tmp/haproxy - server-state-file global - server-state-base /var/state/haproxy/ - -defaults - log global - mode http - option dontlognull - option dontlog-normal - timeout connect 5000 - timeout client 50000 - timeout server 50000 - errorfile 400 /etc/haproxy/errors/400.http - errorfile 403 /etc/haproxy/errors/403.http - errorfile 408 /etc/haproxy/errors/408.http - errorfile 500 /etc/haproxy/errors/500.http - errorfile 502 /etc/haproxy/errors/502.http - errorfile 503 /etc/haproxy/errors/503.http - errorfile 504 /etc/haproxy/errors/504.http - -# haproxy stats, required hostport and firewall rules for :1936 -listen stats - bind *:1936 - mode http - stats enable - stats hide-version - stats realm Haproxy\ Statistics - stats uri / - -frontend httpfrontend - # Frontend bound on all network interfaces on port 80 - bind *:80 - mode http diff --git a/images/haproxy/pod.yaml b/images/haproxy/pod.yaml deleted file mode 100644 index 645b5938b..000000000 --- a/images/haproxy/pod.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: simple -spec: - containers: - - image: gcr.io/google_containers/haproxy:0.2 - imagePullPolicy: Always - name: haproxy - command: - - /usr/sbin/haproxy - args: - - -db - - -f - - /etc/haproxy/haproxy.cfg - ports: - - containerPort: 80 diff --git a/images/nginx-slim/Dockerfile b/images/nginx-slim/Dockerfile deleted file mode 100644 index 95a453c54..000000000 --- a/images/nginx-slim/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2015 The Kubernetes Authors. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -FROM gcr.io/google_containers/ubuntu-slim:0.1 - -COPY build.sh /tmp - -RUN /tmp/build.sh - -# Create symlinks to redirect nginx logs to stdout and stderr docker log collector -# This only works if nginx is started with CMD or ENTRYPOINT -RUN ln -sf /dev/stdout /var/log/nginx/access.log -RUN ln -sf /dev/stderr /var/log/nginx/error.log - -EXPOSE 80 443 - -CMD ["nginx", "-g", "daemon off;"] diff --git a/images/nginx-slim/Makefile b/images/nginx-slim/Makefile deleted file mode 100644 index 68e6ecdef..000000000 --- a/images/nginx-slim/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -all: push - -# 0.0.0 shouldn't clobber any released builds -TAG = 0.4 -PREFIX = gcr.io/google_containers/nginx-slim - -container: - docker build -t $(PREFIX):$(TAG) . - -push: container - gcloud docker push $(PREFIX):$(TAG) - -clean: - docker rmi -f $(PREFIX):$(TAG) || true diff --git a/images/nginx-slim/README.md b/images/nginx-slim/README.md deleted file mode 100644 index eefa25649..000000000 --- a/images/nginx-slim/README.md +++ /dev/null @@ -1,24 +0,0 @@ - -nginx 1.9.x base image using alpine linux - -nginx [engine x] is an HTTP and reverse proxy server, a mail proxy server, and a generic TCP proxy server. - -This custom nginx image contains: -- http2 instead of spdy -- [lua](https://github.com/openresty/lua-nginx-module) support -- [stream](http://nginx.org/en/docs/stream/ngx_stream_core_module.html) tcp support for upstreams -- nginx stats [nginx-module-vts](https://github.com/vozlt/nginx-module-vts) - - -**How to use this image:** -This image does provides a default configuration file with no backend servers. - -*Using docker* -``` -$ docker run -v /some/nginx.con:/etc/nginx/nginx.conf:ro gcr.io/google_containers/nginx-slim:0.3 -``` - -*Creating a replication controller* -``` -$ kubectl create -f ./rc.yaml -``` diff --git a/images/nginx-slim/build.sh b/images/nginx-slim/build.sh deleted file mode 100755 index e50b3064a..000000000 --- a/images/nginx-slim/build.sh +++ /dev/null @@ -1,185 +0,0 @@ -#!/bin/sh - -# Copyright 2015 The Kubernetes Authors All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -set -e - -export NGINX_VERSION=1.9.12 -export NDK_VERSION=0.2.19 -export VTS_VERSION=0.1.8 -export SETMISC_VERSION=0.29 -export LUA_VERSION=0.10.1rc0 -export LUA_CJSON_VERSION=f79aa68af865ae84b36c7e794beedd87fef2ed54 -export LUA_RESTY_HTTP_VERSION=0.07 -export LUA_UPSTREAM_VERSION=0.04 -export MORE_HEADERS_VERSION=0.29 - -export BUILD_PATH=/tmp/build - -get_src() -{ - hash="$1" - url="$2" - f=$(basename "$url") - - curl -sSL "$url" -o "$f" - echo "$hash $f" | sha256sum -c - || exit 10 - tar xzf "$f" - rm -rf "$f" -} - -mkdir "$BUILD_PATH" -cd "$BUILD_PATH" - -# install required packages to build -apt-get update && apt-get install --no-install-recommends -y \ - bash \ - build-essential \ - curl ca-certificates \ - libgeoip1 \ - libgeoip-dev \ - patch \ - libpcre3 \ - libpcre3-dev \ - libssl-dev \ - zlib1g \ - zlib1g-dev \ - libaio1 \ - libaio-dev \ - luajit \ - openssl \ - libluajit-5.1-dev \ - linux-headers-generic - -# download, verify and extract the source files -get_src 1af2eb956910ed4b11aaf525a81bc37e135907e7127948f9179f5410337da042 \ - "http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz" - -get_src 501f299abdb81b992a980bda182e5de5a4b2b3e275fbf72ee34dd7ae84c4b679 \ - "https://github.com/simpl/ngx_devel_kit/archive/v$NDK_VERSION.tar.gz" - -get_src 8d280fc083420afb41dbe10df9a8ceec98f1d391bd2caa42ebae67d5bc9295d8 \ - "https://github.com/openresty/set-misc-nginx-module/archive/v$SETMISC_VERSION.tar.gz" - -get_src 6bb9a36d8d70302d691c49557313fb7262cafd942a961d11a2730d9a5d9f70e0 \ - "https://github.com/vozlt/nginx-module-vts/archive/v$VTS_VERSION.tar.gz" - -get_src 1bae94d2a0fd4fad39f2544a2f8eaf71335ea512a6f0027af190b46562224c68 \ - "https://github.com/openresty/lua-nginx-module/archive/v$LUA_VERSION.tar.gz" - -get_src 2c451368a9e1a6fc01ed196cd6bd1602ee29f4b264df9263816e4dce17bca2c0 \ - "https://github.com/openresty/lua-cjson/archive/$LUA_CJSON_VERSION.tar.gz" - -get_src 1c6aa06c9955397c94e9c3e0c0fba4e2704e85bee77b4512fb54ae7c25d58d86 \ - "https://github.com/pintsized/lua-resty-http/archive/v$LUA_RESTY_HTTP_VERSION.tar.gz" - -get_src 0a5f3003b5851373b03c542723eb5e7da44a01bf4c4c5f20b4de53f355a28d33 \ - "https://github.com/openresty/headers-more-nginx-module/archive/v$MORE_HEADERS_VERSION.tar.gz" - -get_src eec4bbb40fd14e12179fd536a029e2fe82a7f29340ed357879d0b02b65302913 \ - "https://github.com/openresty/lua-upstream-nginx-module/archive/v$LUA_UPSTREAM_VERSION.tar.gz" - -# build nginx -cd "$BUILD_PATH/nginx-$NGINX_VERSION" - -./configure \ - --prefix=/usr/share/nginx \ - --conf-path=/etc/nginx/nginx.conf \ - --http-log-path=/var/log/nginx/access.log \ - --error-log-path=/var/log/nginx/error.log \ - --lock-path=/var/lock/nginx.lock \ - --pid-path=/run/nginx.pid \ - --http-client-body-temp-path=/var/lib/nginx/body \ - --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \ - --http-proxy-temp-path=/var/lib/nginx/proxy \ - --http-scgi-temp-path=/var/lib/nginx/scgi \ - --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \ - --with-debug \ - --with-pcre-jit \ - --with-ipv6 \ - --with-http_ssl_module \ - --with-http_stub_status_module \ - --with-http_realip_module \ - --with-http_auth_request_module \ - --with-http_addition_module \ - --with-http_dav_module \ - --with-http_geoip_module \ - --with-http_gzip_static_module \ - --with-http_sub_module \ - --with-http_v2_module \ - --with-stream \ - --with-stream_ssl_module \ - --with-threads \ - --with-file-aio \ - --add-module="$BUILD_PATH/ngx_devel_kit-$NDK_VERSION" \ - --add-module="$BUILD_PATH/set-misc-nginx-module-$SETMISC_VERSION" \ - --add-module="$BUILD_PATH/nginx-module-vts-$VTS_VERSION" \ - --add-module="$BUILD_PATH/lua-nginx-module-$LUA_VERSION" \ - --add-module="$BUILD_PATH/headers-more-nginx-module-$MORE_HEADERS_VERSION" \ - --add-module="$BUILD_PATH/lua-upstream-nginx-module-$LUA_UPSTREAM_VERSION" \ - && make && make install - -echo "Installing CJSON module" -cd "$BUILD_PATH/lua-cjson-$LUA_CJSON_VERSION" -make LUA_INCLUDE_DIR=/usr/include/luajit-2.0 && make install - -echo "Installing lua-resty-http module" -# copy lua module -cd "$BUILD_PATH/lua-resty-http-$LUA_RESTY_HTTP_VERSION" -sed -i 's/resty.http_headers/http_headers/' $BUILD_PATH/lua-resty-http-$LUA_RESTY_HTTP_VERSION/lib/resty/http.lua -cp $BUILD_PATH/lua-resty-http-$LUA_RESTY_HTTP_VERSION/lib/resty/http.lua /usr/local/lib/lua/5.1 -cp $BUILD_PATH/lua-resty-http-$LUA_RESTY_HTTP_VERSION/lib/resty/http_headers.lua /usr/local/lib/lua/5.1 - -echo "Cleaning..." - -cd / - -apt-mark unmarkauto \ - bash \ - curl ca-certificates \ - libgeoip1 \ - libpcre3 \ - zlib1g \ - libaio1 \ - luajit \ - libluajit-5.1-2 \ - xz-utils \ - geoip-bin \ - openssl - -apt-get remove -y --purge \ - build-essential \ - gcc-5 \ - cpp-5 \ - libgeoip-dev \ - libpcre3-dev \ - libssl-dev \ - zlib1g-dev \ - libaio-dev \ - libluajit-5.1-dev \ - linux-libc-dev \ - linux-headers-generic - -apt-get autoremove -y - -mkdir -p /var/lib/nginx/body /usr/share/nginx/html - -mv /usr/share/nginx/sbin/nginx /usr/sbin - -rm -rf "$BUILD_PATH" -rm -Rf /usr/share/man /usr/share/doc -rm -rf /tmp/* /var/tmp/* -rm -rf /var/lib/apt/lists/* diff --git a/images/nginx-slim/rc.yaml b/images/nginx-slim/rc.yaml deleted file mode 100644 index d645ae9bf..000000000 --- a/images/nginx-slim/rc.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: nginxslimsvc - labels: - app: nginxslim -spec: - type: NodePort - ports: - - port: 80 - protocol: TCP - name: http - selector: - app: nginxslim ---- -apiVersion: v1 -kind: ReplicationController -metadata: - name: nginxslim -spec: - replicas: 1 - selector: - app: nginxslim - template: - metadata: - labels: - app: nginxslim - name: frontend - spec: - containers: - - name: nginxslim - image: gcr.io/google_containers/nginx-slim:0.4 - ports: - - containerPort: 80