Modified docker-compose and Dockerfile
This commit is contained in:
parent
88dcbeee45
commit
0c403e67c5
@ -6,7 +6,6 @@ RUN adduser -D -g 'www' www
|
|||||||
RUN mkdir /www
|
RUN mkdir /www
|
||||||
RUN chown -R www:www /var/lib/nginx
|
RUN chown -R www:www /var/lib/nginx
|
||||||
RUN chown -R www:www /www
|
RUN chown -R www:www /www
|
||||||
COPY index.html /www/index.html
|
|
||||||
|
|
||||||
WORKDIR /etc/nginx/
|
WORKDIR /etc/nginx/
|
||||||
COPY nginx/nginx.conf nginx.conf
|
COPY nginx/nginx.conf nginx.conf
|
||||||
@ -14,13 +13,9 @@ RUN mkdir conf.d/
|
|||||||
WORKDIR /
|
WORKDIR /
|
||||||
|
|
||||||
FROM base AS portfolio-proxy
|
FROM base AS portfolio-proxy
|
||||||
WORKDIR /etc/nginx/conf.d/
|
|
||||||
COPY nginx/default-nginx-proxy.conf default.conf
|
|
||||||
EXPOSE 80/tcp
|
EXPOSE 80/tcp
|
||||||
CMD ["nginx","-g","daemon off;"]
|
CMD ["nginx","-g","daemon off;"]
|
||||||
|
|
||||||
FROM base AS portfolio-web
|
FROM base AS portfolio-web
|
||||||
WORKDIR /etc/nginx/conf.d/
|
|
||||||
COPY nginx/default-nginx-web.conf default.conf
|
|
||||||
EXPOSE 8080/tcp
|
EXPOSE 8080/tcp
|
||||||
CMD ["nginx","-g","daemon off;"]
|
CMD ["nginx","-g","daemon off;"]
|
||||||
|
@ -12,6 +12,8 @@ services:
|
|||||||
protocol: tcp
|
protocol: tcp
|
||||||
app_protocol: http
|
app_protocol: http
|
||||||
mode: host
|
mode: host
|
||||||
|
volumes:
|
||||||
|
- ./nginx/default-nginx-proxy.conf:/etc/nginx/conf.d/default.conf:ro
|
||||||
|
|
||||||
web:
|
web:
|
||||||
build:
|
build:
|
||||||
@ -21,9 +23,12 @@ services:
|
|||||||
expose:
|
expose:
|
||||||
- "8080/tcp"
|
- "8080/tcp"
|
||||||
volumes:
|
volumes:
|
||||||
|
- ./nginx/default-nginx-web.conf:/etc/nginx/conf.d/default.conf:ro
|
||||||
- portfolio-www:/www
|
- portfolio-www:/www
|
||||||
volumes:
|
volumes:
|
||||||
portfolio-www:
|
portfolio-www:
|
||||||
external: true
|
driver: local
|
||||||
name: portfolio-www
|
driver_opts:
|
||||||
|
type: none
|
||||||
|
o: bind
|
||||||
|
device: /home/admin/portfolio
|
||||||
|
Loading…
x
Reference in New Issue
Block a user