Skip to content

Commit

Permalink
move containers into packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Zeragamba committed Jul 14, 2024
1 parent a73dfda commit 016655a
Show file tree
Hide file tree
Showing 446 changed files with 69 additions and 109 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/runConfigurations/Test_Client.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions .run/Development - Start.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Development - Start" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
<deployment type="docker-compose.yml">
<settings>
<option name="envFilePath" value="" />
<option name="envVars">
<list>
<DockerEnvVarImpl>
<option name="name" value="IMAGES_URL" />
<option name="value" value="https://localhost:8080/images" />
</DockerEnvVarImpl>
<DockerEnvVarImpl>
<option name="name" value="server_url" />
<option name="value" value="https://localhost:8080/api" />
</DockerEnvVarImpl>
</list>
</option>
<option name="commandLineOptions" value="--build" />
<option name="services">
<list>
<option value="router" />
<option value="client" />
</list>
</option>
<option name="sourceFilePath" value="docker-compose.yml" />
</settings>
</deployment>
<method v="2" />
</configuration>
</component>
33 changes: 0 additions & 33 deletions .run/Development_ Start (Build).run.xml

This file was deleted.

32 changes: 0 additions & 32 deletions .run/Development_ Start.run.xml

This file was deleted.

30 changes: 30 additions & 0 deletions .run/Prod - Start.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Prod - Start" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
<deployment type="docker-compose.yml">
<settings>
<option name="envFilePath" value="" />
<option name="envVars">
<list>
<DockerEnvVarImpl>
<option name="name" value="IMAGES_URL" />
<option name="value" value="https://localhost:8080/images" />
</DockerEnvVarImpl>
<DockerEnvVarImpl>
<option name="name" value="server_url" />
<option name="value" value="https://localhost:8080/api" />
</DockerEnvVarImpl>
</list>
</option>
<option name="commandLineOptions" value="--build" />
<option name="services">
<list>
<option value="router" />
<option value="client" />
</list>
</option>
<option name="sourceFilePath" value="docker-compose.production.yml" />
</settings>
</deployment>
<method v="2" />
</configuration>
</component>
6 changes: 3 additions & 3 deletions docker-compose.production.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
router:
build: ./router
build: packages/router
depends_on:
- server
- og-injector
Expand All @@ -13,7 +13,7 @@ services:
- "${SSL_KEY}:/opt/ssl/current.key:ro"

server:
build: ./server
build: packages/server
command: bin/rails s -p 3000 -b 0.0.0.0
volumes:
- ./.volumes/images:/opt/images:rw
Expand All @@ -37,7 +37,7 @@ services:
IMAGES_DIR: "/opt/images"

client:
build: ./client
build: packages/client
volumes:
- ./.volumes/client:/opt/client/dist:rw
environment:
Expand Down
15 changes: 3 additions & 12 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,12 @@ services:
extends:
file: docker-compose.production.yml
service: router
develop:
watch:
- action: rebuild
path: ./router/nginx.conf

server:
extends:
file: docker-compose.production.yml
service: server
volumes:
- ./server:/opt/server:rw
- ./packages/server:/opt/server:rw
- ./.volumes/images:/opt/images:rw
environment:
CLIENT_URL: "${DEV_CLIENT_URL}"
Expand All @@ -27,7 +22,7 @@ services:
file: docker-compose.production.yml
service: client
volumes:
- ./client:/opt/client:rw
- ./packages/client:/opt/client:rw
- ./.volumes/client:/opt/client/dist:rw
- "${SSL_CRT}:/opt/ssl/current.crt:ro"
- "${SSL_KEY}:/opt/ssl/current.key:ro"
Expand All @@ -48,12 +43,8 @@ services:
ports:
- "${DEV_INJECTOR_PORT}:3000"
volumes:
- ./packages/og-injector-rust/target/debug/og-injector:/usr/bin/og-injector:ro
- ./packages/og-injector-rust/target/debug/og-injector-rust:/usr/bin/og-injector-rust:ro
- ./.volumes/client:/opt/client:ro
develop:
watch:
- action: rebuild
path: ./packages/og-injector/src

db:
extends:
Expand Down
13 changes: 0 additions & 13 deletions package.json

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 016655a

Please sign in to comment.