Changing to 0.0.0.0, fixing docker. Fixes #53
This commit is contained in:
parent
9558cc6a50
commit
a83daf379b
|
@ -1,7 +1,6 @@
|
||||||
FROM node:10-jessie as node
|
FROM node:10-jessie as node
|
||||||
#If encounter Invalid cross-device error -run on host 'echo N | sudo tee /sys/module/overlay/parameters/metacopy'
|
#If encounter Invalid cross-device error -run on host 'echo N | sudo tee /sys/module/overlay/parameters/metacopy'
|
||||||
ARG TORRENTS_CSV_ENDPOINT
|
ARG TORRENTS_CSV_ENDPOINT
|
||||||
|
|
||||||
COPY server/ui /app/server/ui
|
COPY server/ui /app/server/ui
|
||||||
RUN cd /app/server/ui && yarn && yarn build
|
RUN cd /app/server/ui && yarn && yarn build
|
||||||
|
|
||||||
|
|
|
@ -5,10 +5,11 @@ services:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
args:
|
args:
|
||||||
TORRENTS_CSV_ENDPOINT: http://0.0.0.0:8080
|
TORRENTS_CSV_ENDPOINT: http://0.0.0.0:8088
|
||||||
command: /bin/sh -c /app/torrents-csv-service
|
command: /bin/sh -c /app/torrents-csv-service
|
||||||
ports:
|
ports:
|
||||||
- "8080:8080"
|
- "8080:8080"
|
||||||
environment:
|
environment:
|
||||||
TORRENTS_CSV_DB_FILE: /app/torrents.db
|
TORRENTS_CSV_DB_FILE: /app/torrents.db
|
||||||
TORRENTS_CSV_FRONT_END_DIR: /app/dist
|
TORRENTS_CSV_FRONT_END_DIR: /app/dist
|
||||||
|
TORRENTS_CSV_ENDPOINT: 0.0.0.0:8080
|
||||||
|
|
|
@ -13,7 +13,7 @@ use std::ops::Deref;
|
||||||
use rusqlite::{Connection};
|
use rusqlite::{Connection};
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
println!("Access me at http://localhost:8080");
|
println!("Access me at {}", endpoint());
|
||||||
server::new(|| {
|
server::new(|| {
|
||||||
App::new()
|
App::new()
|
||||||
.route("/service/search", http::Method::GET, search)
|
.route("/service/search", http::Method::GET, search)
|
||||||
|
@ -22,10 +22,9 @@ fn main() {
|
||||||
"/static",
|
"/static",
|
||||||
fs::StaticFiles::new(front_end_dir())
|
fs::StaticFiles::new(front_end_dir())
|
||||||
.unwrap()
|
.unwrap()
|
||||||
// .index_file("index.html"),
|
|
||||||
)
|
)
|
||||||
.finish()
|
.finish()
|
||||||
}).bind("localhost:8080")
|
}).bind(endpoint())
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.run();
|
.run();
|
||||||
}
|
}
|
||||||
|
@ -42,6 +41,9 @@ fn torrents_db_file() -> String {
|
||||||
env::var("TORRENTS_CSV_DB_FILE").unwrap_or("../../torrents.db".to_string())
|
env::var("TORRENTS_CSV_DB_FILE").unwrap_or("../../torrents.db".to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn endpoint() -> String {
|
||||||
|
env::var("TORRENTS_CSV_ENDPOINT").unwrap_or("0.0.0.0:8080".to_string())
|
||||||
|
}
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
struct SearchQuery {
|
struct SearchQuery {
|
||||||
q: String,
|
q: String,
|
||||||
|
|
|
@ -2,7 +2,7 @@ require('dotenv').config();
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
|
|
||||||
exports.setEnv = function() {
|
exports.setEnv = function() {
|
||||||
let endpoint = (process.env.TORRENTS_CSV_ENDPOINT) ? process.env.TORRENTS_CSV_ENDPOINT : "http://localhost:8080";
|
let endpoint = (process.env.TORRENTS_CSV_ENDPOINT) ? process.env.TORRENTS_CSV_ENDPOINT : "http://0.0.0.0:8080";
|
||||||
let env_line = `export const endpoint = '${endpoint}';`;
|
let env_line = `export const endpoint = '${endpoint}';`;
|
||||||
fs.writeFile("src/env.ts", env_line, function (err) {
|
fs.writeFile("src/env.ts", env_line, function (err) {
|
||||||
console.log("Wrote src/env.ts:");
|
console.log("Wrote src/env.ts:");
|
||||||
|
|
Loading…
Reference in New Issue