diff options
author | 2019-01-03 16:54:50 +0100 | |
---|---|---|
committer | 2019-01-03 16:54:50 +0100 | |
commit | 03e61247159837b566b0cfcc380606dc317fbf1a (patch) | |
tree | 731792f18e95258f5d87747c98c70c833e9eaea9 /bash/tools/creating_data/create_nginx_image | |
parent | 329320e637f5ab3bea558db0e13452ab9cfc7bab (diff) |
Fix whitespaces across the bash scripts
Change-Id: I8f3912f1b7f35aa889ce63592b30014d6433a82f
Issue-ID: OOM-1551
Signed-off-by: Petr Ospalý <p.ospaly@partner.samsung.com>
Diffstat (limited to 'bash/tools/creating_data/create_nginx_image')
-rw-r--r-- | bash/tools/creating_data/create_nginx_image/01create-image.sh | 3 | ||||
-rw-r--r-- | bash/tools/creating_data/create_nginx_image/Dockerfile | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/bash/tools/creating_data/create_nginx_image/01create-image.sh b/bash/tools/creating_data/create_nginx_image/01create-image.sh index 5469d3e7..86d96cf2 100644 --- a/bash/tools/creating_data/create_nginx_image/01create-image.sh +++ b/bash/tools/creating_data/create_nginx_image/01create-image.sh @@ -1,4 +1,5 @@ #! /usr/bin/env bash + # COPYRIGHT NOTICE STARTS HERE # # Copyright 2018 © Samsung Electronics Co., Ltd. @@ -16,6 +17,8 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + + script_dir="$(dirname ${BASH_SOURCE[0]})" cd "$script_dir" docker build -t own_nginx . diff --git a/bash/tools/creating_data/create_nginx_image/Dockerfile b/bash/tools/creating_data/create_nginx_image/Dockerfile index aafa264c..412d4edb 100644 --- a/bash/tools/creating_data/create_nginx_image/Dockerfile +++ b/bash/tools/creating_data/create_nginx_image/Dockerfile @@ -15,8 +15,18 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + FROM nginx:alpine + RUN apk add --no-cache --update fcgiwrap git git-daemon spawn-fcgi + +#RUN mkdir /srv/http +#VOLUME ["/var/log/nginx"] + COPY gitconfig /etc/ +#COPY nginx.conf /etc/nginx/nginx.conf + CMD spawn-fcgi -M 666 -s /var/run/fcgiwrap.socket /usr/bin/fcgiwrap && \ nginx -g "daemon off;" + +#CMD ["spawn-fcgi","-M 666","-s /var/run/fcgiwrap.socket","/usr/sbin/fcgiwrap"] |