구조 변경 커밋

This commit is contained in:
chpark 2024-12-19 11:59:04 +09:00
parent 7ece0dd180
commit 9e0a67d6bc
337 changed files with 468 additions and 291 deletions

View File

@ -3,12 +3,12 @@
version: "3.8" version: "3.8"
services: services:
fems-admin: plm-admin:
build: build:
context: ./fems-admin context: ./plm-admin
dockerfile: Dockerfile dockerfile: Dockerfile
target: production target: production
container_name: fems-admin container_name: plm-admin
restart: unless-stopped restart: unless-stopped
env_file: env_file:
- .env.${NODE_ENV:-development} - .env.${NODE_ENV:-development}
@ -17,7 +17,7 @@ services:
environment: environment:
- NODE_ENV=${NODE_ENV:-development} - NODE_ENV=${NODE_ENV:-development}
volumes: volumes:
- ./fems-admin:/app - ./plm-admin:/app
- /app/node_modules - /app/node_modules
logging: logging:
driver: "json-file" driver: "json-file"
@ -30,14 +30,14 @@ services:
timeout: 10s timeout: 10s
retries: 3 retries: 3
depends_on: depends_on:
- fems-api - plm-api
fems-app: plm-app:
build: build:
context: ./fems-app context: ./plm-app
dockerfile: Dockerfile dockerfile: Dockerfile
target: production target: production
container_name: fems-app container_name: plm-app
restart: unless-stopped restart: unless-stopped
env_file: env_file:
- .env.${NODE_ENV:-development} - .env.${NODE_ENV:-development}
@ -46,17 +46,17 @@ services:
environment: environment:
- NODE_ENV=${NODE_ENV:-development} - NODE_ENV=${NODE_ENV:-development}
volumes: volumes:
- ./fems-app:/app - ./plm-app:/app
- /app/node_modules - /app/node_modules
depends_on: depends_on:
- fems-api - plm-api
fems-api: plm-api:
build: build:
context: ./fems-api context: ./plm-api
dockerfile: Dockerfile dockerfile: Dockerfile
target: production target: production
container_name: fems-api container_name: plm-api
restart: unless-stopped restart: unless-stopped
env_file: env_file:
- .env.${NODE_ENV:-development} - .env.${NODE_ENV:-development}
@ -65,7 +65,7 @@ services:
environment: environment:
- NODE_ENV=${NODE_ENV:-development} - NODE_ENV=${NODE_ENV:-development}
volumes: volumes:
- ./fems-api:/app - ./plm-api:/app
- /app/node_modules - /app/node_modules
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3001/health"] test: ["CMD", "curl", "-f", "http://localhost:3001/health"]
@ -73,32 +73,32 @@ services:
timeout: 10s timeout: 10s
retries: 3 retries: 3
fems-realtime-api: # plm-realtime-api:
build: # build:
context: ./fems-realtime-api # context: ./plm-realtime-api
dockerfile: Dockerfile # dockerfile: Dockerfile
target: production # target: production
container_name: fems-realtime-api # container_name: plm-realtime-api
restart: unless-stopped # restart: unless-stopped
env_file: # env_file:
- .env.${NODE_ENV:-development} # - .env.${NODE_ENV:-development}
ports: # ports:
- "${REALTIME_API_PORT}:3004" # - "${REALTIME_API_PORT}:3004"
environment: # environment:
- NODE_ENV=${NODE_ENV:-development} # - NODE_ENV=${NODE_ENV:-development}
volumes: # volumes:
- ./fems-realtime-api:/app # - ./plm-realtime-api:/app
- /app/node_modules # - /app/node_modules
depends_on: # depends_on:
- fems-api # - plm-api
healthcheck: # healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3004/health"] # test: ["CMD", "curl", "-f", "http://localhost:3004/health"]
interval: 30s # interval: 30s
timeout: 10s # timeout: 10s
retries: 3 # retries: 3
networks: # networks:
default: # default:
driver: bridge # driver: bridge
internal: # internal:
driver: bridge # driver: bridge

View File

@ -3,9 +3,9 @@
version: "3.8" version: "3.8"
services: services:
fems-postgres: plm-postgres:
image: postgres:16 image: postgres:16
container_name: fems-postgres container_name: plm-postgres
restart: unless-stopped restart: unless-stopped
env_file: env_file:
- .env.${NODE_ENV:-development} - .env.${NODE_ENV:-development}
@ -22,11 +22,11 @@ services:
- POSTGRES_INITDB_ARGS=--auth-host=scram-sha-256 --auth-local=scram-sha-256 - POSTGRES_INITDB_ARGS=--auth-host=scram-sha-256 --auth-local=scram-sha-256
- TZ=Asia/Seoul - TZ=Asia/Seoul
volumes: volumes:
- fems_postgres:/var/lib/postgresql/data - plm_postgres:/var/lib/postgresql/data
- ./backups/postgres:/backups - ./backups/postgres:/backups
- ./fems-postgres/init-scripts:/docker-entrypoint-initdb.d - ./plm-postgres/init-scripts:/docker-entrypoint-initdb.d
- ./fems-postgres/postgresql.conf:/etc/postgresql/postgresql.conf:ro - ./plm-postgres/postgresql.conf:/etc/postgresql/postgresql.conf:ro
- ./fems-postgres/pg_hba.conf:/etc/postgresql/pg_hba.conf:ro - ./plm-postgres/pg_hba.conf:/etc/postgresql/pg_hba.conf:ro
command: command:
- "postgres" - "postgres"
- "-c" - "-c"
@ -37,112 +37,112 @@ services:
timeout: 5s timeout: 5s
retries: 5 retries: 5
fems-timescaledb: # plm-timescaledb:
build: # build:
context: ./fems-timescaledb # context: ./plm-timescaledb
dockerfile: Dockerfile # dockerfile: Dockerfile
container_name: fems-timescaledb # container_name: plm-timescaledb
restart: unless-stopped # restart: unless-stopped
env_file: # env_file:
- .env.${NODE_ENV:-development} # - .env.${NODE_ENV:-development}
ports:
- "${TIMESCALEDB_PORT}:5433"
environment:
- NODE_ENV=${NODE_ENV:-development}
- LANG=en_US.utf8
- LANGUAGE=en_US.utf8
- LC_ALL=en_US.utf8
- TZ=Asia/Seoul
- POSTGRES_HOST_AUTH_METHOD=scram-sha-256
- POSTGRES_INITDB_ARGS=--auth-host=scram-sha-256 --auth-local=scram-sha-256
- POSTGRES_DB=${TIMESCALEDB_DB}
- POSTGRES_USER=${TIMESCALEDB_USER}
- POSTGRES_PASSWORD=${TIMESCALEDB_PASSWORD}
# - TIMESCALEDB_DB=${TIMESCALEDB_DB}
# - TIMESCALEDB_USER=${TIMESCALEDB_USER}
# - TIMESCALEDB_PASSWORD=${TIMESCALEDB_PASSWORD}
volumes:
- fems_timescaledb:/var/lib/postgresql/data
- ./fems-timescaledb/postgresql.conf:/etc/postgresql/postgresql.conf:ro
- ./fems-timescaledb/pg_hba.conf:/etc/postgresql/pg_hba.conf:ro
- ./fems-timescaledb/init-scripts:/docker-entrypoint-initdb.d/:ro
command: ["postgres", "-c", "config_file=/etc/postgresql/postgresql.conf"]
healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"]
interval: 10s
timeout: 5s
retries: 5
fems-redis:
image: redis:alpine
container_name: fems-redis
restart: unless-stopped
env_file:
- .env.${NODE_ENV:-development}
# ports: # ports:
# - "${REDIS_PORT}:6379" # - "${TIMESCALEDB_PORT}:5433"
command: ["redis-server", "--requirepass", "${REDIS_PASSWORD}"] # environment:
volumes: # - NODE_ENV=${NODE_ENV:-development}
- fems_redis:/data # - LANG=en_US.utf8
- ./backups/redis:/backups # - LANGUAGE=en_US.utf8
environment: # - LC_ALL=en_US.utf8
- NODE_ENV=${NODE_ENV:-development} # - TZ=Asia/Seoul
- REDIS_PASSWORD=${REDIS_PASSWORD} # - POSTGRES_HOST_AUTH_METHOD=scram-sha-256
depends_on: # - POSTGRES_INITDB_ARGS=--auth-host=scram-sha-256 --auth-local=scram-sha-256
- fems-postgres # - POSTGRES_DB=${TIMESCALEDB_DB}
- fems-timescaledb # - POSTGRES_USER=${TIMESCALEDB_USER}
healthcheck: # - POSTGRES_PASSWORD=${TIMESCALEDB_PASSWORD}
test: ["CMD", "redis-cli", "-a", "${REDIS_PASSWORD}", "ping"] # # - TIMESCALEDB_DB=${TIMESCALEDB_DB}
interval: 10s # # - TIMESCALEDB_USER=${TIMESCALEDB_USER}
timeout: 5s # # - TIMESCALEDB_PASSWORD=${TIMESCALEDB_PASSWORD}
retries: 3 # volumes:
# - plm_timescaledb:/var/lib/postgresql/data
# - ./plm-timescaledb/postgresql.conf:/etc/postgresql/postgresql.conf:ro
# - ./plm-timescaledb/pg_hba.conf:/etc/postgresql/pg_hba.conf:ro
# - ./plm-timescaledb/init-scripts:/docker-entrypoint-initdb.d/:ro
# command: ["postgres", "-c", "config_file=/etc/postgresql/postgresql.conf"]
# healthcheck:
# test: ["CMD-SHELL", "pg_isready -U postgres"]
# interval: 10s
# timeout: 5s
# retries: 5
fems-mqtt: # plm-redis:
build: # image: redis:alpine
context: ./fems-mqtt # container_name: plm-redis
dockerfile: Dockerfile # restart: unless-stopped
args: # env_file:
- MQTT_USERNAME=${MQTT_USERNAME} # - .env.${NODE_ENV:-development}
- MQTT_PASSWORD=${MQTT_PASSWORD} # # ports:
- NODE_RED_USERNAME=${NODE_RED_USERNAME} # # - "${REDIS_PORT}:6379"
- NODE_RED_PASSWORD=${NODE_RED_PASSWORD} # command: ["redis-server", "--requirepass", "${REDIS_PASSWORD}"]
container_name: fems-mqtt # volumes:
restart: unless-stopped # - plm_redis:/data
env_file: # - ./backups/redis:/backups
- .env.${NODE_ENV:-development} # environment:
ports: # - NODE_ENV=${NODE_ENV:-development}
- "${MQTT_PORT}:1883" # - REDIS_PASSWORD=${REDIS_PASSWORD}
- "${MQTT_WSS_PORT}:8883" # depends_on:
environment: # - plm-postgres
- MQTT_USERNAME=${MQTT_USERNAME} # - plm-timescaledb
- MQTT_PASSWORD=${MQTT_PASSWORD} # healthcheck:
- NODE_RED_USERNAME=${NODE_RED_USERNAME} # test: ["CMD", "redis-cli", "-a", "${REDIS_PASSWORD}", "ping"]
- NODE_RED_PASSWORD=${NODE_RED_PASSWORD} # interval: 10s
volumes: # timeout: 5s
- ./fems-mqtt/data:/mosquitto/data # retries: 3
- ./fems-mqtt/config:/mosquitto/config
- ./fems-mqtt/log:/mosquitto/log # plm-mqtt:
- ./fems-mqtt/certs:/mosquitto/certs # build:
# entrypoint: ["/docker-entrypoint.sh"] # context: ./plm-mqtt
# command: ["/usr/sbin/mosquitto", "-c", "/mosquitto/config/mosquitto.conf"] # dockerfile: Dockerfile
user: mosquitto # args:
healthcheck: # - MQTT_USERNAME=${MQTT_USERNAME}
test: # - MQTT_PASSWORD=${MQTT_PASSWORD}
[ # - NODE_RED_USERNAME=${NODE_RED_USERNAME}
"CMD-SHELL", # - NODE_RED_PASSWORD=${NODE_RED_PASSWORD}
"mosquitto_sub -h localhost -t '$$SYS/#' -C 1 -u ${MQTT_USERNAME} -P ${MQTT_PASSWORD} || exit 1", # container_name: plm-mqtt
] # restart: unless-stopped
interval: 30s # env_file:
timeout: 10s # - .env.${NODE_ENV:-development}
retries: 3 # ports:
depends_on: # - "${MQTT_PORT}:1883"
- fems-postgres # - "${MQTT_WSS_PORT}:8883"
- fems-timescaledb # environment:
# - MQTT_USERNAME=${MQTT_USERNAME}
# - MQTT_PASSWORD=${MQTT_PASSWORD}
# - NODE_RED_USERNAME=${NODE_RED_USERNAME}
# - NODE_RED_PASSWORD=${NODE_RED_PASSWORD}
# volumes:
# - ./plm-mqtt/data:/mosquitto/data
# - ./plm-mqtt/config:/mosquitto/config
# - ./plm-mqtt/log:/mosquitto/log
# - ./plm-mqtt/certs:/mosquitto/certs
# # entrypoint: ["/docker-entrypoint.sh"]
# # command: ["/usr/sbin/mosquitto", "-c", "/mosquitto/config/mosquitto.conf"]
# user: mosquitto
# healthcheck:
# test:
# [
# "CMD-SHELL",
# "mosquitto_sub -h localhost -t '$$SYS/#' -C 1 -u ${MQTT_USERNAME} -P ${MQTT_PASSWORD} || exit 1",
# ]
# interval: 30s
# timeout: 10s
# retries: 3
# depends_on:
# - plm-postgres
# - plm-timescaledb
volumes: volumes:
fems_postgres: plm_postgres:
fems_redis: # plm_redis:
fems_timescaledb: # plm_timescaledb:
networks: networks:
default: default:

View File

@ -3,7 +3,7 @@
version: "3.8" version: "3.8"
services: services:
fems-admin: plm-admin:
build: build:
target: development target: development
env_file: env_file:
@ -14,11 +14,11 @@ services:
- WATCHPACK_POLLING=true - WATCHPACK_POLLING=true
# 개발 환경에서는 healthcheck 비활성화 # 개발 환경에서는 healthcheck 비활성화
volumes: volumes:
- ../../wacefems/uploads:/app/uploads - ../../waceplm/uploads:/app/uploads
# healthcheck: # healthcheck:
# disable: true # disable: true
fems-app: plm-app:
build: build:
target: development target: development
env_file: env_file:
@ -28,9 +28,9 @@ services:
- NEXT_WEBPACK_USEPOLLING=1 - NEXT_WEBPACK_USEPOLLING=1
- WATCHPACK_POLLING=true - WATCHPACK_POLLING=true
volumes: volumes:
- ../../wacefems/uploads:/app/uploads - ../../waceplm/uploads:/app/uploads
fems-api: plm-api:
build: build:
target: development target: development
env_file: env_file:
@ -38,20 +38,20 @@ services:
environment: environment:
- NODE_ENV=${NODE_ENV:-development} - NODE_ENV=${NODE_ENV:-development}
volumes: volumes:
- ../../wacefems/uploads:/app/uploads - ../../waceplm/uploads:/app/uploads
fems-realtime-api: # plm-realtime-api:
build: # build:
target: development # target: development
env_file: # env_file:
- .env.${NODE_ENV:-development} # - .env.${NODE_ENV:-development}
environment: # environment:
- NODE_ENV=${NODE_ENV:-development} # - NODE_ENV=${NODE_ENV:-development}
volumes: # volumes:
- ../../wacefems/uploads:/app/uploads # - ../../waceplm/uploads:/app/uploads
networks: # networks:
default: # default:
driver: bridge # driver: bridge
internal: # internal:
driver: bridge # driver: bridge

View File

@ -1,40 +0,0 @@
{
"keep": {
"days": true,
"amount": 14
},
"auditLog": "/app/logs/error/.f0712455ac9b956018e7ebc08dc33061795e3736-audit.json",
"files": [
{
"date": 1733746784906,
"name": "/app/logs/error/error-2024-12-09.log",
"hash": "bc01734a47c5ab9a0c8c5579b91d673c834b9da80bf2bec63403efb28be39c35"
},
{
"date": 1733793585406,
"name": "/app/logs/error/error-2024-12-10.log",
"hash": "bb9f2826cd5ea0ca46e9f22cc120339198f29e37cf5d03b8f53b36a37ac45b22"
},
{
"date": 1733879841776,
"name": "/app/logs/error/error-2024-12-11.log",
"hash": "39195d6169da96b7fe430ade1b2115a82fb0a51334153ceb54541d28d6f739ee"
},
{
"date": 1733996836759,
"name": "/app/logs/error/error-2024-12-12.log",
"hash": "4fc1efc550131d80937035aba62464a360b76f1c7050cdc48b28858bf254152e"
},
{
"date": 1734056145579,
"name": "/app/logs/error/error-2024-12-13.log",
"hash": "cc5bbf7c932c3d774eca30710f1f6e4c27bd563a9b7f09bd7082373375712a72"
},
{
"date": 1734271478004,
"name": "/app/logs/error/error-2024-12-15.log",
"hash": "cabb58ab38fec604b311d3aaf8fc4d0f0c6f592f473f0900ee851cc7dd523459"
}
],
"hashType": "sha256"
}

View File

@ -1,40 +0,0 @@
{
"keep": {
"days": true,
"amount": 14
},
"auditLog": "/app/logs/info/.17ff23bf9d3be0bd8551fdd86d0d3cca3a97cd90-audit.json",
"files": [
{
"date": 1733746784908,
"name": "/app/logs/info/info-2024-12-09.log",
"hash": "91a97133406f7c8225f6a4c44c7e5b284852ffe413bfba6b024440a56cef6046"
},
{
"date": 1733793585410,
"name": "/app/logs/info/info-2024-12-10.log",
"hash": "9adf5bcedf67ed51d1e795830fd55f28eafff19169585bf2109a3e8a1eea2ad4"
},
{
"date": 1733879841786,
"name": "/app/logs/info/info-2024-12-11.log",
"hash": "e966ad92bddef5e4c0517226872d8bab241ca53eec10b0d6c43a1dd46388bfef"
},
{
"date": 1733996836771,
"name": "/app/logs/info/info-2024-12-12.log",
"hash": "1c987d2eab99acceb0ee4f85ab1653ed592ec1c5aa9214aaf54230e15830404c"
},
{
"date": 1734056145586,
"name": "/app/logs/info/info-2024-12-13.log",
"hash": "37d2e4f9e427887b31fa4bba1b2f1e41d1d54514adb78509870cd3f636c47ea1"
},
{
"date": 1734271478014,
"name": "/app/logs/info/info-2024-12-15.log",
"hash": "bc3f088f0c8b7520435ea7873cf36de592eb566add967608002b63eef96088bd"
}
],
"hashType": "sha256"
}

View File

@ -1,40 +0,0 @@
{
"keep": {
"days": true,
"amount": 14
},
"auditLog": "/app/logs/system/.d741815bd363f7141809635bfe8d8a1642abfc24-audit.json",
"files": [
{
"date": 1733746784910,
"name": "/app/logs/system/system-2024-12-09.log",
"hash": "29e3a71219f6eb5844373ab72f70cd54d1a44dfc6491ee42ecef0931f5031459"
},
{
"date": 1733793585414,
"name": "/app/logs/system/system-2024-12-10.log",
"hash": "44911f386576690f54e37dcf880b071f931b3f0927f8c2f97eff948eef82de2a"
},
{
"date": 1733879841794,
"name": "/app/logs/system/system-2024-12-11.log",
"hash": "377a78384280ae0a2ffba508995bcc46a4a718c069702599347ef1306ef47163"
},
{
"date": 1733996836783,
"name": "/app/logs/system/system-2024-12-12.log",
"hash": "b8614ccdecfaf9afaef272e735927d04f25143279a904f6e794d7d1afe396245"
},
{
"date": 1734056145590,
"name": "/app/logs/system/system-2024-12-13.log",
"hash": "9c6cd1946da18741b7c00d8786bae1068cca830b02f4ce106e887e04751ab477"
},
{
"date": 1734271478023,
"name": "/app/logs/system/system-2024-12-15.log",
"hash": "1915f8fec16ea6329ea53199426f1ce8307fccd0b504056b2a50b0d30d7c72f9"
}
],
"hashType": "sha256"
}

View File

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Some files were not shown because too many files have changed in this diff Show More