Browse code
Change nginx-ingress Docker file
Update nginx-ingress Docker file to fix k8s test failure:
[ kubetest_console - ERROR - RESULT: kubectl create -f ingress.yaml (False) 1 ]
Based on commit 1927655dca "Change nginx-ingress Docker file" from 2.0
Change-Id: I760681cfa76ca4e4e7503190c85d71a66ef102b1
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5172
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Dheeraj S Shetty <dheerajs@vmware.com>
Srivatsa S. Bhat authored on 2018/05/22 03:22:41Showing 1 changed files
| ... | ... |
@@ -2,7 +2,7 @@ FROM vmware/photon:1.0 |
| 2 | 2 |
|
| 3 | 3 |
MAINTAINER kulkarniv@vmware.com |
| 4 | 4 |
|
| 5 |
-RUN tdnf install -y shadow openssl nginx |
|
| 5 |
+RUN tdnf install -y shadow openssl nginx zlib-devel --refresh |
|
| 6 | 6 |
RUN useradd --system --no-create-home -U -s /bin/false nginx |
| 7 | 7 |
|
| 8 | 8 |
# forward nginx access and error logs to stdout and stderr |
| ... | ... |
@@ -14,11 +14,11 @@ COPY [ "./tmp/nginxinc/usr/share/nginx-ingress/docker/nginx.ingress.tmpl", \ |
| 14 | 14 |
"./tmp/nginxinc/usr/bin/nginx-ingress", \ |
| 15 | 15 |
"/" ] |
| 16 | 16 |
|
| 17 |
-RUN mkdir -p /etc/nginx/secrets && \ |
|
| 17 |
+RUN mkdir -p /etc/nginx/secrets/ && \ |
|
| 18 | 18 |
mkdir -p /etc/nginx/conf.d && \ |
| 19 | 19 |
cd /etc/nginx/secrets && \ |
| 20 | 20 |
openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout default.key -out default.crt -subj "/CN=NGINXIngressController" && \ |
| 21 |
- cat default.key default.crt > default.pem && \ |
|
| 21 |
+ cat default.key default.crt > default && \ |
|
| 22 | 22 |
rm default.key default.crt |
| 23 | 23 |
|
| 24 | 24 |
ENTRYPOINT ["/nginx-ingress"] |