rename og-injector-rust

Zeragamba · Aug 12, 2024 · 5ab5e5e · 5ab5e5e
1 parent 2e222f7
commit 5ab5e5e
Show file tree

Hide file tree

Showing 59 changed files with 22 additions and 2,894 deletions.
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
@@ -47,7 +47,7 @@ services:
     command: yarn build
 
   og-injector:
-    build: packages/og-injector-rust
+    build: packages/og-injector
     volumes:
       - ./.volumes/client:/opt/client:ro
     environment:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -45,7 +45,7 @@ services:
     ports:
       - "${DEV_INJECTOR_PORT}:3000"
     volumes:
-      - ./packages/og-injector-rust/target/debug/og-injector-rust:/usr/bin/og-injector-rust:ro
+      - ./packages/og-injector/target/debug/og-injector:/usr/bin/og-injector:ro
       - ./.volumes/client:/opt/client:ro
 
   db:

diff --git a/packages/og-injector-rust/.dockerignore b/packages/og-injector-rust/.dockerignore
diff --git a/packages/og-injector-rust/.gitignore b/packages/og-injector-rust/.gitignore
diff --git a/packages/og-injector-rust/.idea/.gitignore b/packages/og-injector-rust/.idea/.gitignore
diff --git a/packages/og-injector-rust/.idea/inspectionProfiles/Project_Default.xml b/packages/og-injector-rust/.idea/inspectionProfiles/Project_Default.xml
diff --git a/packages/og-injector-rust/.idea/modules.xml b/packages/og-injector-rust/.idea/modules.xml
diff --git a/packages/og-injector-rust/.idea/vcs.xml b/packages/og-injector-rust/.idea/vcs.xml
diff --git a/packages/og-injector-rust/Dockerfile b/packages/og-injector-rust/Dockerfile
diff --git a/packages/og-injector/.dockerignore b/packages/og-injector/.dockerignore
@@ -1,2 +1,3 @@
-node_modules/
-log/
+target/
+.idea/
+.env
diff --git a/packages/og-injector/.gitignore b/packages/og-injector/.gitignore
@@ -1,2 +1 @@
-node_modules/
-log/
+target/
diff --git a/packages/og-injector/.idea/.gitignore b/packages/og-injector/.idea/.gitignore
diff --git a/packages/og-injector/.idea/inspectionProfiles/Project_Default.xml b/packages/og-injector/.idea/inspectionProfiles/Project_Default.xml
diff --git a/packages/og-injector/.idea/misc.xml b/packages/og-injector/.idea/misc.xml
diff --git a/packages/og-injector/.idea/modules.xml b/packages/og-injector/.idea/modules.xml
diff --git a/...-injector-rust/.idea/og-injector-rust.iml → ...es/og-injector/.idea/og-injector-rust.iml b/...-injector-rust/.idea/og-injector-rust.iml → ...es/og-injector/.idea/og-injector-rust.iml
diff --git a/packages/og-injector/.idea/og-injector.iml b/packages/og-injector/.idea/og-injector.iml
diff --git a/packages/og-injector/.idea/vcs.xml b/packages/og-injector/.idea/vcs.xml
diff --git a/packages/og-injector/.yarnrc.yml b/packages/og-injector/.yarnrc.yml
diff --git a/packages/og-injector-rust/Cargo.lock → packages/og-injector/Cargo.lock b/packages/og-injector-rust/Cargo.lock → packages/og-injector/Cargo.lock
diff --git a/packages/og-injector-rust/Cargo.toml → packages/og-injector/Cargo.toml b/packages/og-injector-rust/Cargo.toml → packages/og-injector/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "og-injector-rust"
+name = "og-injector"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/packages/og-injector/Dockerfile b/packages/og-injector/Dockerfile
@@ -1,13 +1,15 @@
-FROM node:22.2.0
-RUN corepack enable
+FROM rust AS builder
 
-WORKDIR /opt/og-injector
-
-COPY ["package.json", "yarn.lock", ".yarnrc.yml", "./"]
-RUN --mount=type=cache,target=/root/.yarn \
-    YARN_CACHE_FOLDER=/root/.yarn \
-    yarn install --immutable
+WORKDIR /opt/build
 
 COPY . .
+RUN --mount=type=cache,target=/usr/local/cargo/registry \
+    --mount=type=cache,target=./target \
+    cargo build --release \
+    && mkdir /opt/dist \
+    && cp ./target/release/og-injector /opt/dist/og-injector
+
+FROM ubuntu
+COPY --from=builder /opt/dist/og-injector /usr/bin
 
-CMD [ "node", "passenger.js" ]
+CMD ["og-injector"]
diff --git a/packages/og-injector/config.ts b/packages/og-injector/config.ts
diff --git a/packages/og-injector/package.json b/packages/og-injector/package.json
diff --git a/packages/og-injector/passenger.js b/packages/og-injector/passenger.js