Merge branch 'main' into dockerfile-BASE_DIR-support
This commit is contained in:
29
Dockerfile
29
Dockerfile
@@ -34,8 +34,37 @@ ARG BASE_URL
|
||||
|
||||
COPY --chown=nginx:nginx --from=builder /app/dist /usr/share/nginx/html${BASE_URL%/}
|
||||
COPY --chown=nginx:nginx nginx.conf /etc/nginx/nginx.conf
|
||||
|
||||
RUN set -e; \
|
||||
SUBDIR=$(echo "${BASE_URL}" | sed 's:^/::; s:/$::'); \
|
||||
if [ -z "${SUBDIR}" ] || [ "${SUBDIR}" = "/" ]; then \
|
||||
DEST_DIR="/usr/share/nginx/html"; \
|
||||
else \
|
||||
DEST_DIR="/usr/share/nginx/html/${SUBDIR}"; \
|
||||
mkdir -p "${DEST_DIR}"; \
|
||||
fi; \
|
||||
chown -R nginx:nginx /usr/share/nginx/html; \
|
||||
echo "Destination directory: ${DEST_DIR}"
|
||||
|
||||
COPY --chown=nginx:nginx --from=builder /app/dist /tmp/dist
|
||||
|
||||
RUN set -e; \
|
||||
SUBDIR=$(echo "${BASE_URL}" | sed 's:^/::; s:/$::'); \
|
||||
if [ -z "${SUBDIR}" ] || [ "${SUBDIR}" = "/" ]; then \
|
||||
DEST_DIR="/usr/share/nginx/html"; \
|
||||
else \
|
||||
DEST_DIR="/usr/share/nginx/html/${SUBDIR}"; \
|
||||
fi; \
|
||||
cp -r /tmp/dist/* "${DEST_DIR}/"; \
|
||||
rm -rf /tmp/dist; \
|
||||
chown -R nginx:nginx /usr/share/nginx/html; \
|
||||
echo "Files copied to: ${DEST_DIR}"; \
|
||||
ls -la "${DEST_DIR}" | head -20
|
||||
|
||||
RUN mkdir -p /etc/nginx/tmp && chown -R nginx:nginx /etc/nginx/tmp
|
||||
|
||||
USER nginx
|
||||
|
||||
EXPOSE 8080
|
||||
CMD ["nginx", "-g", "daemon off;"]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user