dev into staging #414

Merged
edraft merged 58 commits from dev into staging 2023-11-04 17:47:24 +01:00
2 changed files with 3 additions and 3 deletions
Showing only changes of commit 410049be6e - Show all commits

View File

@ -1,7 +1,7 @@
FROM nginx:alpine
COPY nginx.conf.template /etc/nginx/conf.d/nginx.conf.template
RUN rm -rf /usr/share/nginx/html/*
COPY ./dist/kdb-web/ /usr/share/nginx/html
COPY ./dist/web/ /usr/share/nginx/html
RUN apk update
RUN apk add bash
CMD /bin/bash -c "envsubst '\$BOT_CONTAINER_NAME' < /etc/nginx/conf.d/nginx.conf.template > /etc/nginx/nginx.conf; nginx -g 'daemon off;'"

View File

@ -1,5 +1,5 @@
{
"name": "kdb-web",
"name": "web",
"version": "1.2.0",
"scripts": {
"ng": "ng",
@ -52,4 +52,4 @@
"tslib": "^2.4.1",
"typescript": "~4.9.5"
}
}
}