Compare commits
3 Commits
8c108ceeeb
...
09c10efb46
| Author | SHA256 | Date | |
|---|---|---|---|
|
09c10efb46
|
|||
|
c85c769646
|
|||
|
743743ceb6
|
@@ -1,13 +1,7 @@
|
|||||||
FROM rust:1.83-slim-bookworm AS builder
|
FROM alpine:3 AS builder
|
||||||
LABEL authors="raven"
|
LABEL authors="raven"
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apk add --no-cache rust cargo openssl-dev protoc
|
||||||
&& DEBIAN_FRONTEND=noninteractive \
|
|
||||||
apt-get install --no-install-recommends --assume-yes \
|
|
||||||
pkg-config \
|
|
||||||
libssl-dev \
|
|
||||||
protobuf-compiler \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
WORKDIR /usr/src/utils
|
WORKDIR /usr/src/utils
|
||||||
COPY ./utils .
|
COPY ./utils .
|
||||||
@@ -20,14 +14,9 @@ COPY ./api-service .
|
|||||||
|
|
||||||
RUN cargo build --release
|
RUN cargo build --release
|
||||||
|
|
||||||
FROM debian:bookworm-slim
|
FROM alpine:3
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apk add --no-cache libssl3 libgcc
|
||||||
&& DEBIAN_FRONTEND=noninteractive \
|
|
||||||
apt-get install --no-install-recommends --assume-yes \
|
|
||||||
pkg-config \
|
|
||||||
libssl-dev \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
COPY --from=builder /usr/src/api-service/target/release/api-service /usr/local/bin/api-service
|
COPY --from=builder /usr/src/api-service/target/release/api-service /usr/local/bin/api-service
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,7 @@
|
|||||||
FROM rust:1.83-slim-bookworm AS builder
|
FROM alpine:3 AS builder
|
||||||
LABEL authors="raven"
|
LABEL authors="raven"
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apk add --no-cache rust cargo openssl-dev protoc
|
||||||
&& DEBIAN_FRONTEND=noninteractive \
|
|
||||||
apt-get install --no-install-recommends --assume-yes \
|
|
||||||
pkg-config \
|
|
||||||
libssl-dev \
|
|
||||||
protobuf-compiler \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
WORKDIR /usr/src/utils
|
WORKDIR /usr/src/utils
|
||||||
COPY ./utils .
|
COPY ./utils .
|
||||||
@@ -25,14 +19,9 @@ COPY ./auth-service .
|
|||||||
RUN cargo build --release
|
RUN cargo build --release
|
||||||
|
|
||||||
# Use a minimal base image to run the application
|
# Use a minimal base image to run the application
|
||||||
FROM debian:bookworm-slim
|
FROM alpine:3
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apk add --no-cache libssl3 libgcc
|
||||||
&& DEBIAN_FRONTEND=noninteractive \
|
|
||||||
apt-get install --no-install-recommends --assume-yes \
|
|
||||||
pkg-config \
|
|
||||||
libssl-dev \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# Copy the compiled binary
|
# Copy the compiled binary
|
||||||
COPY --from=builder /usr/src/auth-service/target/release/auth-service /usr/local/bin/auth-service
|
COPY --from=builder /usr/src/auth-service/target/release/auth-service /usr/local/bin/auth-service
|
||||||
|
|||||||
@@ -1,13 +1,7 @@
|
|||||||
FROM rust:1.83-slim-bookworm AS builder
|
FROM alpine:3 AS builder
|
||||||
LABEL authors="raven"
|
LABEL authors="raven"
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apk add --no-cache rust cargo openssl-dev protoc
|
||||||
&& DEBIAN_FRONTEND=noninteractive \
|
|
||||||
apt-get install --no-install-recommends --assume-yes \
|
|
||||||
pkg-config \
|
|
||||||
libssl-dev \
|
|
||||||
protobuf-compiler \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
WORKDIR /usr/src/utils
|
WORKDIR /usr/src/utils
|
||||||
COPY ./utils .
|
COPY ./utils .
|
||||||
@@ -20,14 +14,9 @@ COPY ./character-service .
|
|||||||
|
|
||||||
RUN cargo build --release
|
RUN cargo build --release
|
||||||
|
|
||||||
FROM debian:bookworm-slim
|
FROM alpine:3
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apk add --no-cache libssl3 libgcc
|
||||||
&& DEBIAN_FRONTEND=noninteractive \
|
|
||||||
apt-get install --no-install-recommends --assume-yes \
|
|
||||||
pkg-config \
|
|
||||||
libssl-dev \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
COPY --from=builder /usr/src/character-service/target/release/character-service /usr/local/bin/character-service
|
COPY --from=builder /usr/src/character-service/target/release/character-service /usr/local/bin/character-service
|
||||||
|
|
||||||
|
|||||||
@@ -17,14 +17,8 @@ dotenv = "0.15"
|
|||||||
tracing = "0.1"
|
tracing = "0.1"
|
||||||
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "chrono"] }
|
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "chrono"] }
|
||||||
prost = "0.13.3"
|
prost = "0.13.3"
|
||||||
prost-types = "0.13.3"
|
|
||||||
redis = "0.27.5"
|
|
||||||
deadpool-redis = "0.18.0"
|
|
||||||
serde_json = "1.0.133"
|
serde_json = "1.0.133"
|
||||||
async-trait = "0.1.83"
|
async-trait = "0.1.83"
|
||||||
mockall = "0.13.1"
|
|
||||||
reqwest = { version = "0.12.9", features = ["json"] }
|
|
||||||
warp = "0.3.7"
|
|
||||||
utils = { path = "../utils" }
|
utils = { path = "../utils" }
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
|
|||||||
@@ -1,13 +1,7 @@
|
|||||||
FROM rust:1.83-slim-bookworm AS builder
|
FROM alpine:3 AS builder
|
||||||
LABEL authors="raven"
|
LABEL authors="raven"
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apk add --no-cache rust cargo openssl-dev protoc
|
||||||
&& DEBIAN_FRONTEND=noninteractive \
|
|
||||||
apt-get install --no-install-recommends --assume-yes \
|
|
||||||
pkg-config \
|
|
||||||
libssl-dev \
|
|
||||||
protobuf-compiler \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
WORKDIR /usr/src/utils
|
WORKDIR /usr/src/utils
|
||||||
COPY ./utils .
|
COPY ./utils .
|
||||||
@@ -20,14 +14,9 @@ COPY ./database-service .
|
|||||||
|
|
||||||
RUN cargo build --release
|
RUN cargo build --release
|
||||||
|
|
||||||
FROM debian:bookworm-slim
|
FROM alpine:3
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apk add --no-cache libssl3 libgcc
|
||||||
&& DEBIAN_FRONTEND=noninteractive \
|
|
||||||
apt-get install --no-install-recommends --assume-yes \
|
|
||||||
pkg-config \
|
|
||||||
libssl-dev \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
COPY --from=builder /usr/src/database-service/target/release/database-service /usr/local/bin/database-service
|
COPY --from=builder /usr/src/database-service/target/release/database-service /usr/local/bin/database-service
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,7 @@
|
|||||||
FROM rust:1.83-slim-bookworm AS builder
|
FROM alpine:3 AS builder
|
||||||
LABEL authors="raven"
|
LABEL authors="raven"
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apk add --no-cache rust cargo openssl-dev protoc
|
||||||
&& DEBIAN_FRONTEND=noninteractive \
|
|
||||||
apt-get install --no-install-recommends --assume-yes \
|
|
||||||
pkg-config \
|
|
||||||
libssl-dev \
|
|
||||||
protobuf-compiler \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
WORKDIR /usr/src/utils
|
WORKDIR /usr/src/utils
|
||||||
COPY ./utils .
|
COPY ./utils .
|
||||||
@@ -20,14 +14,9 @@ COPY ./packet-service .
|
|||||||
|
|
||||||
RUN cargo build --release
|
RUN cargo build --release
|
||||||
|
|
||||||
FROM debian:bookworm-slim
|
FROM alpine:3
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apk add --no-cache libssl3 libgcc
|
||||||
&& DEBIAN_FRONTEND=noninteractive \
|
|
||||||
apt-get install --no-install-recommends --assume-yes \
|
|
||||||
pkg-config \
|
|
||||||
libssl-dev \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
COPY --from=builder /usr/src/packet-service/target/release/packet-service /usr/local/bin/packet-service
|
COPY --from=builder /usr/src/packet-service/target/release/packet-service /usr/local/bin/packet-service
|
||||||
|
|
||||||
|
|||||||
@@ -159,7 +159,6 @@ pub(crate) async fn handle_select_char_req(stream: &mut TcpStream, packet: Packe
|
|||||||
use crate::packets::srv_select_char_reply::*;
|
use crate::packets::srv_select_char_reply::*;
|
||||||
use crate::packets::srv_inventory_data::*;
|
use crate::packets::srv_inventory_data::*;
|
||||||
use crate::packets::srv_quest_data::*;
|
use crate::packets::srv_quest_data::*;
|
||||||
use crate::packets::srv_select_char_reply::*;
|
|
||||||
use crate::packets::srv_billing_message::*;
|
use crate::packets::srv_billing_message::*;
|
||||||
use crate::types::{HotbarItem, StatusEffect};
|
use crate::types::{HotbarItem, StatusEffect};
|
||||||
let request = CliSelectCharReq::decode(packet.payload.as_slice())?;
|
let request = CliSelectCharReq::decode(packet.payload.as_slice())?;
|
||||||
@@ -195,7 +194,7 @@ pub(crate) async fn handle_select_char_req(stream: &mut TcpStream, packet: Packe
|
|||||||
let mut inventory: [srv_inventory_data::Item; (MAX_ITEMS as usize)] = core::array::from_fn(|i| srv_inventory_data::Item::default());
|
let mut inventory: [srv_inventory_data::Item; (MAX_ITEMS as usize)] = core::array::from_fn(|i| srv_inventory_data::Item::default());
|
||||||
|
|
||||||
for item in items {
|
for item in items {
|
||||||
if item.slot < 10 {
|
if item.slot < MAX_VISIBLE_ITEMS as i32 {
|
||||||
let slot = convert_slot(item.slot) as usize;
|
let slot = convert_slot(item.slot) as usize;
|
||||||
equipped_item_list[slot] = EquippedItem {
|
equipped_item_list[slot] = EquippedItem {
|
||||||
id: item.item_id as u16,
|
id: item.item_id as u16,
|
||||||
|
|||||||
@@ -1,13 +1,7 @@
|
|||||||
FROM rust:1.83-slim-bookworm AS builder
|
FROM alpine:3 AS builder
|
||||||
LABEL authors="raven"
|
LABEL authors="raven"
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apk add --no-cache rust cargo openssl-dev protoc
|
||||||
&& DEBIAN_FRONTEND=noninteractive \
|
|
||||||
apt-get install --no-install-recommends --assume-yes \
|
|
||||||
pkg-config \
|
|
||||||
libssl-dev \
|
|
||||||
protobuf-compiler \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
WORKDIR /usr/src/utils
|
WORKDIR /usr/src/utils
|
||||||
COPY ./utils .
|
COPY ./utils .
|
||||||
@@ -20,14 +14,9 @@ COPY ./session-service .
|
|||||||
|
|
||||||
RUN cargo build --release
|
RUN cargo build --release
|
||||||
|
|
||||||
FROM debian:bookworm-slim
|
FROM alpine:3
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apk add --no-cache libssl3 libgcc
|
||||||
&& DEBIAN_FRONTEND=noninteractive \
|
|
||||||
apt-get install --no-install-recommends --assume-yes \
|
|
||||||
pkg-config \
|
|
||||||
libssl-dev \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
COPY --from=builder /usr/src/session-service/target/release/session-service /usr/local/bin/session-service
|
COPY --from=builder /usr/src/session-service/target/release/session-service /usr/local/bin/session-service
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,7 @@
|
|||||||
FROM rust:1.83-slim-bookworm AS builder
|
FROM alpine:3 AS builder
|
||||||
LABEL authors="raven"
|
LABEL authors="raven"
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apk add --no-cache rust cargo openssl-dev protoc
|
||||||
&& DEBIAN_FRONTEND=noninteractive \
|
|
||||||
apt-get install --no-install-recommends --assume-yes \
|
|
||||||
pkg-config \
|
|
||||||
libssl-dev \
|
|
||||||
protobuf-compiler \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
WORKDIR /usr/src/utils
|
WORKDIR /usr/src/utils
|
||||||
COPY ./utils .
|
COPY ./utils .
|
||||||
@@ -20,14 +14,9 @@ COPY ./world-service .
|
|||||||
|
|
||||||
RUN cargo build --release
|
RUN cargo build --release
|
||||||
|
|
||||||
FROM debian:bookworm-slim
|
FROM alpine:3
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apk add --no-cache libssl3 libgcc
|
||||||
&& DEBIAN_FRONTEND=noninteractive \
|
|
||||||
apt-get install --no-install-recommends --assume-yes \
|
|
||||||
pkg-config \
|
|
||||||
libssl-dev \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
COPY --from=builder /usr/src/world-service/target/release/world-service /usr/local/bin/world-service
|
COPY --from=builder /usr/src/world-service/target/release/world-service /usr/local/bin/world-service
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user