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: I2926c251a4fc6282401b3599cd68a55696ad0340
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5173
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:33:23Showing 1 changed files
| ... | ... |
@@ -3,7 +3,7 @@ FROM k8s-base-image:2.0 |
| 3 | 3 |
MAINTAINER kulkarniv@vmware.com |
| 4 | 4 |
|
| 5 | 5 |
COPY [ "./stage-rpms-tdnf.conf", "./tmp/stage-rpms.repo", "/tmp/tdnf/" ] |
| 6 |
-RUN tdnf -c /tmp/tdnf/stage-rpms-tdnf.conf install -y openssl nginx shadow --refresh |
|
| 6 |
+RUN tdnf -c /tmp/tdnf/stage-rpms-tdnf.conf install -y openssl nginx shadow zlib-devel --refresh |
|
| 7 | 7 |
RUN useradd --system --no-create-home -U -s /bin/false nginx |
| 8 | 8 |
|
| 9 | 9 |
# forward nginx access and error logs to stdout and stderr |
| ... | ... |
@@ -15,11 +15,11 @@ COPY [ "./tmp/nginxinc/usr/share/nginx-ingress/docker/nginx.ingress.tmpl", \ |
| 15 | 15 |
"./tmp/nginxinc/usr/bin/nginx-ingress", \ |
| 16 | 16 |
"/" ] |
| 17 | 17 |
|
| 18 |
-RUN mkdir -p /etc/nginx/secrets && \ |
|
| 18 |
+RUN mkdir -p /etc/nginx/secrets/ && \ |
|
| 19 | 19 |
mkdir -p /etc/nginx/conf.d && \ |
| 20 | 20 |
cd /etc/nginx/secrets && \ |
| 21 | 21 |
openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout default.key -out default.crt -subj "/CN=NGINXIngressController" && \ |
| 22 |
- cat default.key default.crt > default.pem && \ |
|
| 22 |
+ cat default.key default.crt > default && \ |
|
| 23 | 23 |
rm default.key default.crt |
| 24 | 24 |
|
| 25 | 25 |
ENTRYPOINT ["/nginx-ingress"] |