0.3 #146

Merged
edraft merged 359 commits from 0.3 into master 2023-01-12 07:04:40 +01:00
4 changed files with 7 additions and 4 deletions
Showing only changes of commit 9ff9cc672e - Show all commits

@ -1 +1 @@
Subproject commit 48c2683965611c9a96ebbb908f8dcb4d0d7d71f2
Subproject commit 6b25cc87fced30b5846505d95f20285a3e4d7adf

View File

@ -1,4 +1,7 @@
FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf
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
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

@ -24,7 +24,7 @@ http {
}
location /api {
proxy_pass http://kdb_bot_staging_1;
proxy_pass http://${BOT_CONTAINER_NAME};
}
}
}

View File

@ -50,4 +50,4 @@
"tslib": "^2.4.1",
"typescript": "~4.7.2"
}
}
}