diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 5ab59faa..3d255771 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -96,4 +96,18 @@ for version in "${versions[@]}"; do Directory: $version/$variant EOE done + + for variant in openshift; do + commit="$(dirCommit "$version/$variant")" + + variantAliases=( "${versionAliases[@]/%/-$variant}" ) + variantAliases=( "${variantAliases[@]//latest-/}" ) + + echo + cat <<-EOE + Tags: $(join ', ' "${variantAliases[@]}") + GitCommit: $commit + Directory: $version/$variant + EOE + done done diff --git a/mainline/openshift/Dockerfile b/mainline/openshift/Dockerfile new file mode 100644 index 00000000..af7b5e4c --- /dev/null +++ b/mainline/openshift/Dockerfile @@ -0,0 +1,32 @@ +FROM docker.io/centos:7 + +ENV NGINX_VERSION 1.13.4-1.el7 + +LABEL maintainer="NGINX Docker Maintainers " + +ADD nginx.repo /etc/yum.repos.d/nginx.repo + +RUN curl -sO http://nginx.org/keys/nginx_signing.key && \ + rpm --import ./nginx_signing.key && \ + yum -y install --setopt=tsflags=nodocs nginx-${NGINX_VERSION}.ngx && \ + rm -f ./nginx_signing.key && \ + yum clean all + +# forward request and error logs to docker log collector +RUN ln -sf /dev/stdout /var/log/nginx/access.log && \ + ln -sf /dev/stderr /var/log/nginx/error.log && \ +# Change pid file location & remove nginx user & change port to 8080 + sed -i 's/\/var\/run\/nginx.pid/\/var\/cache\/nginx\/nginx.pid/g' /etc/nginx/nginx.conf && \ + sed -i -e '/user/!b' -e '/nginx/!b' -e '/nginx/d' /etc/nginx/nginx.conf && \ + sed -i -e '/listen/!b' -e '/80;/!b' -e 's/80;/8080;/' /etc/nginx/conf.d/default.conf && \ +# modify perms for non-root runtime + chown -R 998 /var/cache/nginx /etc/nginx && \ + chmod -R g=u /var/cache/nginx /etc/nginx + +VOLUME ["/var/cache/nginx"] + +EXPOSE 8080 8443 + +USER 998 + +CMD ["nginx", "-g", "daemon off;"] diff --git a/mainline/openshift/nginx.repo b/mainline/openshift/nginx.repo new file mode 100644 index 00000000..25fe8fdb --- /dev/null +++ b/mainline/openshift/nginx.repo @@ -0,0 +1,5 @@ +[nginx] +name=nginx repo +baseurl=http://nginx.org/packages/mainline/centos/7/$basearch/ +gpgcheck=1 +enabled=1 diff --git a/stable/openshift/Dockerfile b/stable/openshift/Dockerfile new file mode 100644 index 00000000..60f44d41 --- /dev/null +++ b/stable/openshift/Dockerfile @@ -0,0 +1,32 @@ +FROM docker.io/centos:7 + +ENV NGINX_VERSION 1.12.1-1.el7 + +LABEL maintainer="NGINX Docker Maintainers " + +ADD nginx.repo /etc/yum.repos.d/nginx.repo + +RUN curl -sO http://nginx.org/keys/nginx_signing.key && \ + rpm --import ./nginx_signing.key && \ + yum -y install --setopt=tsflags=nodocs nginx-${NGINX_VERSION}.ngx && \ + rm -f ./nginx_signing.key && \ + yum clean all + +# forward request and error logs to docker log collector +RUN ln -sf /dev/stdout /var/log/nginx/access.log && \ + ln -sf /dev/stderr /var/log/nginx/error.log && \ +# Change pid file location & remove nginx user & change port to 8080 + sed -i 's/\/var\/run\/nginx.pid/\/var\/cache\/nginx\/nginx.pid/g' /etc/nginx/nginx.conf && \ + sed -i -e '/user/!b' -e '/nginx/!b' -e '/nginx/d' /etc/nginx/nginx.conf && \ + sed -i -e '/listen/!b' -e '/80;/!b' -e 's/80;/8080;/' /etc/nginx/conf.d/default.conf && \ +# modify perms for non-root runtime + chown -R 998 /var/cache/nginx /etc/nginx && \ + chmod -R g=u /var/cache/nginx /etc/nginx + +VOLUME ["/var/cache/nginx"] + +EXPOSE 8080 8443 + +USER 998 + +CMD ["nginx", "-g", "daemon off;"] diff --git a/stable/openshift/nginx.repo b/stable/openshift/nginx.repo new file mode 100644 index 00000000..4b919e08 --- /dev/null +++ b/stable/openshift/nginx.repo @@ -0,0 +1,5 @@ +[nginx] +name=nginx repo +baseurl=http://nginx.org/packages/centos/7/$basearch/ +gpgcheck=1 +enabled=1