合并冲突

licp

2024-05-28 52e18000ace434b2acdebce5e118c45c337a3fe7

1
2
3
4
5
6
FROM nginx
VOLUME /tmp
ENV LANG en_US.UTF-8
ADD ./dist/ /usr/share/nginx/html/
EXPOSE 80
EXPOSE 443