Merge branch 'develop'

This commit is contained in:
sct
2020-12-19 01:03:48 +09:00
7 changed files with 10 additions and 9 deletions

View File

@@ -25,4 +25,4 @@ COPY --from=BUILD_IMAGE /app/node_modules ./node_modules
CMD yarn start CMD yarn start
EXPOSE 3000 EXPOSE 5055

View File

@@ -54,7 +54,7 @@ Currently, Overseerr is only distributed through Docker images. If you have Dock
docker run -d \ docker run -d \
-e LOG_LEVEL=info \ -e LOG_LEVEL=info \
-e TZ=Asia/Tokyo \ -e TZ=Asia/Tokyo \
-p 5055:3000 \ -p 5055:5055 \
-v /path/to/appdata/config:/app/config \ -v /path/to/appdata/config:/app/config \
--restart unless-stopped \ --restart unless-stopped \
sctx/overseerr sctx/overseerr
@@ -76,7 +76,7 @@ After running Overseerr for the first time, configure it by visiting the web UI
## API Documentation ## API Documentation
Full API documentation will soon be published automatically and available outside of running the app. Currently, you can access the API docs by running Overseerr locally and visiting http://localhost:3000/api-docs Full API documentation will soon be published automatically and available outside of running the app. Currently, you can access the API docs by running Overseerr locally and visiting http://localhost:5055/api-docs
## Community ## Community
@@ -124,4 +124,5 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<!-- markdownlint-enable --> <!-- markdownlint-enable -->
<!-- prettier-ignore-end --> <!-- prettier-ignore-end -->
<!-- ALL-CONTRIBUTORS-LIST:END --> <!-- ALL-CONTRIBUTORS-LIST:END -->

View File

@@ -5,7 +5,7 @@ services:
context: . context: .
dockerfile: Dockerfile.local dockerfile: Dockerfile.local
ports: ports:
- 3000:3000 - 5055:5055
volumes: volumes:
- .:/app:rw,cached - .:/app:rw,cached
- /app/node_modules - /app/node_modules

View File

@@ -100,7 +100,7 @@ app
} }
); );
const port = Number(process.env.PORT) || 3000; const port = Number(process.env.PORT) || 5055;
const host = process.env.HOST; const host = process.env.HOST;
if (host) { if (host) {
server.listen(port, host, () => { server.listen(port, host, () => {

View File

@@ -114,7 +114,7 @@ CoreApp.getInitialProps = async (initialProps) => {
if (ctx.res) { if (ctx.res) {
// Check if app is initialized and redirect if necessary // Check if app is initialized and redirect if necessary
const response = await axios.get<{ initialized: boolean }>( const response = await axios.get<{ initialized: boolean }>(
`http://localhost:${process.env.PORT || 3000}/api/v1/settings/public` `http://localhost:${process.env.PORT || 5055}/api/v1/settings/public`
); );
const initialized = response.data.initialized; const initialized = response.data.initialized;
@@ -130,7 +130,7 @@ CoreApp.getInitialProps = async (initialProps) => {
try { try {
// Attempt to get the user by running a request to the local api // Attempt to get the user by running a request to the local api
const response = await axios.get<User>( const response = await axios.get<User>(
`http://localhost:${process.env.PORT || 3000}/api/v1/auth/me`, `http://localhost:${process.env.PORT || 5055}/api/v1/auth/me`,
{ headers: ctx.req ? { cookie: ctx.req.headers.cookie } : undefined } { headers: ctx.req ? { cookie: ctx.req.headers.cookie } : undefined }
); );
user = response.data; user = response.data;

View File

@@ -17,7 +17,7 @@ MoviePage.getInitialProps = async (ctx) => {
if (ctx.req) { if (ctx.req) {
const cookies = parseCookies(ctx); const cookies = parseCookies(ctx);
const response = await axios.get<MovieDetailsType>( const response = await axios.get<MovieDetailsType>(
`http://localhost:${process.env.PORT || 3000}/api/v1/movie/${ `http://localhost:${process.env.PORT || 5055}/api/v1/movie/${
ctx.query.movieId ctx.query.movieId
}${cookies.locale ? `?language=${cookies.locale}` : ''}`, }${cookies.locale ? `?language=${cookies.locale}` : ''}`,
{ {

View File

@@ -17,7 +17,7 @@ TvPage.getInitialProps = async (ctx) => {
if (ctx.req) { if (ctx.req) {
const cookies = parseCookies(ctx); const cookies = parseCookies(ctx);
const response = await axios.get<TvDetailsType>( const response = await axios.get<TvDetailsType>(
`http://localhost:${process.env.PORT || 3000}/api/v1/tv/${ `http://localhost:${process.env.PORT || 5055}/api/v1/tv/${
ctx.query.tvId ctx.query.tvId
}${cookies.locale ? `?language=${cookies.locale}` : ''}`, }${cookies.locale ? `?language=${cookies.locale}` : ''}`,
{ {