kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2549 from wangchunyang/master

Browse Source 
Upgrade to alpine:3.4 and fix issues
This commit is contained in:
Tony Tam
2016-12-01 17:46:03 -08:00
committed by GitHub
parent bfc6dbd50f 7f0de6312e
commit 4e234cc3c7
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@@ -1,12 +1,13 @@
FROM alpine:3.3 FROM alpine:3.4
MAINTAINER Roman Tarnavski MAINTAINER Roman Tarnavski
RUN apk add --update nginx RUN apk add --update nginx
RUN mkdir -p /run/nginx
COPY nginx.conf /etc/nginx/ COPY nginx.conf /etc/nginx/
ADD ./dist/ /usr/share/nginx/html ADD ./dist/ /usr/share/nginx/html
EXPOSE 8080 EXPOSE 8080
CMD nginx -g 'daemon off;' CMD nginx -g 'daemon off;'

2
nginx.conf
View File

@@ -17,7 +17,7 @@ http {
server_name localhost; server_name localhost;
location / { location / {
root html; root /usr/share/nginx/html;
index index.html index.htm; index index.html index.htm;
if ($request_method = 'OPTIONS') { if ($request_method = 'OPTIONS') {
add_header 'Access-Control-Allow-Origin' '*'; add_header 'Access-Control-Allow-Origin' '*';