Changing port, adding icon.

- Fixes #46
- Fixes #37
This commit is contained in:
Dessalines 2019-04-06 16:48:54 -07:00
parent c075ec2c79
commit a615164394
5 changed files with 7 additions and 8 deletions

View file

@ -8,6 +8,5 @@ COPY server /app/server
COPY --from=node /app/ui/dist /app/dist COPY --from=node /app/ui/dist /app/dist
RUN cd /app/server && cargo build --release RUN cd /app/server && cargo build --release
RUN mv /app/server/target/release/lemmy /app/ RUN mv /app/server/target/release/lemmy /app/
EXPOSE 8080
WORKDIR /app/ WORKDIR /app/
EXPOSE 8536

View file

@ -26,7 +26,7 @@ git clone https://github.com/dessalines/lemmy
cd lemmy cd lemmy
docker-compose up docker-compose up
``` ```
and goto http://localhost:8080 and goto http://localhost:8536
### Local Development ### Local Development
#### Requirements #### Requirements
- [Rust](https://www.rust-lang.org/) - [Rust](https://www.rust-lang.org/)
@ -43,7 +43,7 @@ git clone https://github.com/dessalines/lemmy
cd lemmy cd lemmy
./install.sh ./install.sh
``` ```
and goto http://localhost:8080 and goto http://localhost:8536
## Documentation ## Documentation
- [ActivityPub API.md](docs/API.md) - [ActivityPub API.md](docs/API.md)

View file

@ -18,7 +18,7 @@ services:
context: . context: .
command: /bin/sh -c /app/lemmy command: /bin/sh -c /app/lemmy
ports: ports:
- "8080:8080" - "8536:8536"
environment: environment:
LEMMY_FRONT_END_DIR: /app/dist LEMMY_FRONT_END_DIR: /app/dist
DATABASE_URL: postgres://rrr:rrr@db:5432/rrr DATABASE_URL: postgres://rrr:rrr@db:5432/rrr

View file

@ -261,11 +261,11 @@ fn main() {
fs::StaticFiles::new(front_end_dir()).unwrap() fs::StaticFiles::new(front_end_dir()).unwrap()
) )
.finish() .finish()
}).bind("0.0.0.0:8080") }).bind("0.0.0.0:8536")
.unwrap() .unwrap()
.start(); .start();
println!("Started http server: 0.0.0.0:8080"); println!("Started http server: 0.0.0.0:8536");
let _ = sys.run(); let _ = sys.run();
} }

View file

@ -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'; export let wsUri = (window.location.protocol=='https:') ? 'wss://' : 'ws://' + endpoint + '/service/ws';