summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDessalines <tyhou13@gmx.com>2019-04-06 16:48:54 -0700
committerDessalines <tyhou13@gmx.com>2019-04-06 16:48:54 -0700
commita61516439406b7884e19d9ae8a1875c728bbe628 (patch)
treee1b7081b8d22fa563c1a31556d9ac03cf1d5883a
parentc075ec2c79cd0d36891ff67f851134b86f0d6475 (diff)
Changing port, adding icon.
- Fixes #46 - Fixes #37
-rw-r--r--Dockerfile3
-rw-r--r--README.md4
-rw-r--r--docker-compose.yml2
-rw-r--r--server/src/bin/main.rs4
-rw-r--r--ui/src/env.ts2
5 files changed, 7 insertions, 8 deletions
diff --git a/Dockerfile b/Dockerfile
index b17f73c0..9a7caccd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,5 @@ COPY server /app/server
COPY --from=node /app/ui/dist /app/dist
RUN cd /app/server && cargo build --release
RUN mv /app/server/target/release/lemmy /app/
-EXPOSE 8080
WORKDIR /app/
-
+EXPOSE 8536
diff --git a/README.md b/README.md
index 949b49e2..96d81ead 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ git clone https://github.com/dessalines/lemmy
cd lemmy
docker-compose up
```
-and goto http://localhost:8080
+and goto http://localhost:8536
### Local Development
#### Requirements
- [Rust](https://www.rust-lang.org/)
@@ -43,7 +43,7 @@ git clone https://github.com/dessalines/lemmy
cd lemmy
./install.sh
```
-and goto http://localhost:8080
+and goto http://localhost:8536
## Documentation
- [ActivityPub API.md](docs/API.md)
diff --git a/docker-compose.yml b/docker-compose.yml
index c11c9176..940cd0f6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
context: .
command: /bin/sh -c /app/lemmy
ports:
- - "8080:8080"
+ - "8536:8536"
environment:
LEMMY_FRONT_END_DIR: /app/dist
DATABASE_URL: postgres://rrr:rrr@db:5432/rrr
diff --git a/server/src/bin/main.rs b/server/src/bin/main.rs
index 80db1822..ed1c86fe 100644
--- a/server/src/bin/main.rs
+++ b/server/src/bin/main.rs
@@ -261,11 +261,11 @@ fn main() {
fs::StaticFiles::new(front_end_dir()).unwrap()
)
.finish()
- }).bind("0.0.0.0:8080")
+ }).bind("0.0.0.0:8536")
.unwrap()
.start();
- println!("Started http server: 0.0.0.0:8080");
+ println!("Started http server: 0.0.0.0:8536");
let _ = sys.run();
}
diff --git a/ui/src/env.ts b/ui/src/env.ts
index 1750006b..954d835f 100644
--- a/ui/src/env.ts
+++ b/ui/src/env.ts
@@ -1,2 +1,2 @@
-export const endpoint = `${window.location.hostname}:8080`;
+export const endpoint = `${window.location.hostname}:8536`;
export let wsUri = (window.location.protocol=='https:') ? 'wss://' : 'ws://' + endpoint + '/service/ws';