update local docker infra

Innokentii Kozlov · Innokentii Kozlov · commit 17a91a932dc5 · 2025-06-18T11:29:08.000+03:00
diff --git a/Makefile b/Makefile
@@ -14,9 +14,9 @@ build-api-docker-image:
 
 .PHONY: build-migrations-docker-image
 build-migrations-docker-image:
-	docker build -t ghcr.io/kesha123/nodejs-rest-api/migrations:$(MIGRATIONS_IMAGE_TAG) +
-	-f ./data/docker/Dockerfile \
-	./data
+	docker build -t ghcr.io/kesha123/nodejs-rest-api/migrations:$(MIGRATIONS_IMAGE_TAG) \
+		-f ./data/docker/Dockerfile \
+		./data
 
 
 .PHONY: generate-tls-certificates
@@ -27,25 +27,26 @@ generate-tls-certificates:
 	openssl req -new -text -passout pass:${PASSPHRASE} -subj /CN=${COMMON_NAME} -out ${SSL_DIR}/server.req -keyout ${SSL_DIR}/privkey.pem
 	openssl rsa -in ${SSL_DIR}/privkey.pem -passin pass:${PASSPHRASE} -out ${SSL_DIR}/server.key
 	openssl req -x509 -in ${SSL_DIR}/server.req -text -key ${SSL_DIR}/server.key -out ${SSL_DIR}/server.crt
+	@cp ${SSL_DIR}/server.key ${SSL_DIR}/server.key.bak
+	@sudo chown 999:999 ${SSL_DIR}/server.key
 	@sudo chmod 600 ${SSL_DIR}/server.key
 
 
-.PHONY: export-tls-certificates-to-env
-export-tls-certificates-to-env:
-	@echo "Exporting TLS certificates to environment variables..."
-	@mkdir -p $(shell pwd)/infrastructure/docker
-	@echo "SSL_CERTIFICATE=$(shell cat $(SSL_DIR)/server.crt)" >> $(shell pwd)/infrastructure/docker/.env
-	@echo "SSL_KEY=$(shell cat $(SSL_DIR)/server.key)" >> $(shell pwd)/infrastructure/docker/.env
-	@echo "SSL_CA=$(shell cat $(SSL_DIR)/server.crt)" >> $(shell pwd)/infrastructure/docker/.env
-
-
 .PHONY: database-start-local
 database-start-local:
-	docker compose -f ./infrastructure/docker/docker-compose.database.yml up -d
-	docker exec -t nodejs-rest-api_postgres sh -c "psql -U postgres -d postgres -f /opt/sql/insert.sql"
+	docker compose -f $(shell pwd)/infrastructure/docker/docker-compose.database.yml up -d
+	docker run \
+		-ti \
+		--rm \
+		--env-file $(shell pwd)/infrastructure/docker/.env \
+		--network docker_nodejs-rest-api  \
+		--volume $(shell pwd)/infrastructure/docker/ssl/privkey.pem:/migrations/ssl/privkey.pem \
+		--volume $(shell pwd)/infrastructure/docker/ssl/server.crt:/migrations/ssl/server.crt \
+		--volume $(shell pwd)/infrastructure/docker/ssl/server.key.bak:/migrations/ssl/server.key \
+		ghcr.io/kesha123/nodejs-rest-api/migrations:${MIGRATIONS_IMAGE_TAG}
+	docker exec postgres sh -c "psql -U postgres -d postgres -f /opt/sql/insert.sql"
 
 
 .PHONY: api-start-local
 api-start-local:
-	docker compose -f ./infrastructure/docker/docker-compose.yml up -d
-	docker exec -t nodejs-rest-api_postgres sh -c "psql -U postgres -d postgres -f /opt/sql/insert.sql"
+	docker compose -f $(shell pwd)/infrastructure/docker/docker-compose.yaml up -d
diff --git a/api/.gitignore b/api/.gitignore
@@ -54,3 +54,5 @@ pids
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+ssl/
diff --git a/api/docker/.dockerignore b/api/docker/.dockerignore
@@ -2,6 +2,7 @@ docker/
 node_modules/
 test/
 dist/
+ssl/
 .gitignore
 README.md
 .eslintrc.js
diff --git a/api/src/datasource.ts b/api/src/datasource.ts
@@ -5,6 +5,8 @@ import {
   EmployeeEntity,
   DepartmentEntity,
 } from '@kesha123/nodejs-rest-api-datasource';
+import * as fs from 'fs';
+import { join } from 'path';
 
 config();
 
@@ -22,9 +24,9 @@ export const getDataSourceOptions = (): DataSourceOptions => ({
   entities: [EmployeeEntity, DepartmentEntity],
   ssl: {
     rejectUnauthorized: false,
-    ca: process.env.SSL_CA,
-    key: process.env.SSL_KEY,
-    cert: process.env.SSL_CERTIFICATE,
+    ca: fs.readFileSync(join(__dirname, '../ssl/server.crt')).toString(),
+    key: fs.readFileSync(join(__dirname, '../ssl/server.key')).toString(),
+    cert: fs.readFileSync(join(__dirname, '../ssl/server.crt')).toString(),
   },
 });
 
diff --git a/data/docker/.dockerignore b/data/docker/.dockerignore
@@ -2,6 +2,7 @@ docker/
 node_modules/
 dist/
 test/
+ssl/
 .gitignore
 README.md
 .eslint.config.mjs
diff --git a/data/src/datasource.ts b/data/src/datasource.ts
@@ -1,6 +1,7 @@
 import { DataSource, DataSourceOptions } from 'typeorm';
 import { join } from 'path';
 import { config } from 'dotenv';
+import * as fs from 'fs';
 
 config();
 
@@ -17,9 +18,9 @@ export const getDataSourceOptions = (): DataSourceOptions => ({
   migrations: [join(__dirname, './migrations', '**', '*.ts')],
   ssl: {
     rejectUnauthorized: false,
-    ca: process.env.SSL_CA,
-    key: process.env.SSL_KEY,
-    cert: process.env.SSL_CERTIFICATE,
+    ca: fs.readFileSync(join(__dirname, '../ssl/server.crt')).toString(),
+    key: fs.readFileSync(join(__dirname, '../ssl/server.key')).toString(),
+    cert: fs.readFileSync(join(__dirname, '../ssl/server.crt')).toString(),
   },
 });
 
diff --git a/infrastructure/.gitignore b/infrastructure/.gitignore
@@ -0,0 +1 @@
+docker/ssl/
diff --git a/infrastructure/docker/.env b/infrastructure/docker/.env
@@ -10,7 +10,3 @@ POSTGRES_DB=postgres
 POSTGRES_DB_NAME=postgres
 POSTGRES_PASSWORD=postgres
 POSTGRES_USER=postgres
-
-SSL_CERTIFICATE=Certificate:     Data:         Version: 3 (0x2)         Serial Number:             3c:da:2f:fd:38:d2:fe:d5:8c:8a:f6:55:1e:a1:d7:0a:c4:82:6e:97         Signature Algorithm: sha256WithRSAEncryption         Issuer: CN = localhost         Validity             Not Before: Jun 16 18:54:39 2025 GMT             Not After : Jul 16 18:54:39 2025 GMT         Subject: CN = localhost         Subject Public Key Info:             Public Key Algorithm: rsaEncryption                 Public-Key: (2048 bit)                 Modulus:                     00:c9:b0:06:5c:9f:98:77:fb:bd:57:99:4e:1e:2b:                     3d:a5:6d:b8:6c:9f:79:29:ca:25:e1:2a:40:cd:2a:                     94:30:42:c3:a0:6c:d3:37:66:fe:b8:e0:f7:d3:c1:                     68:9e:1c:e4:6f:30:7f:d7:cc:1b:b0:0a:87:39:a4:                     6a:b9:89:87:e9:b2:2e:ff:b0:f3:c4:ca:68:fc:6a:                     73:4e:cb:84:2f:19:f8:d6:9d:a6:d4:a8:be:ce:a7:                     28:c2:c4:7e:f1:36:6b:46:6b:36:10:d9:01:e1:0d:                     c0:5e:ed:a0:c5:23:61:5e:7d:f0:5e:18:09:73:00:                     e0:76:3f:fa:32:0f:eb:78:0b:26:6a:79:ed:c4:f1:                     1d:33:b3:ba:e5:56:82:69:1a:13:56:9c:f4:b7:8f:                     67:85:32:1d:29:46:7e:9f:34:75:f1:de:a6:4e:11:                     53:eb:cc:e3:4a:4f:ec:f1:eb:33:3c:38:af:25:0c:                     c5:72:d8:22:5c:2f:d9:d3:ca:f1:3c:df:f1:2d:86:                     c6:1e:80:a5:27:85:99:79:b9:bc:c9:71:8f:f6:be:                     73:e8:a1:c5:f0:29:1b:cc:5c:e1:71:15:dc:b5:8b:                     5c:f3:ec:13:1a:a5:5c:a1:ec:42:07:7f:ff:2c:27:                     ad:ac:5b:36:94:f0:01:9a:3d:f4:94:17:d6:2e:fe:                     4b:d9                 Exponent: 65537 (0x10001)         X509v3 extensions:             X509v3 Subject Key Identifier:                  F5:30:8F:65:80:0F:A3:02:96:85:6B:90:14:0C:03:6D:E5:A6:3E:4E             X509v3 Authority Key Identifier:                  F5:30:8F:65:80:0F:A3:02:96:85:6B:90:14:0C:03:6D:E5:A6:3E:4E             X509v3 Basic Constraints: critical                 CA:TRUE     Signature Algorithm: sha256WithRSAEncryption     Signature Value:         05:51:f8:0f:87:19:a3:ab:ed:c5:e5:8d:0a:05:f5:e9:45:2e:         ac:07:16:99:7f:01:57:f4:e7:51:f8:bc:eb:57:41:96:07:c5:         22:4c:de:45:24:c9:57:ae:66:98:6e:41:4f:fc:49:cf:26:62:         ce:c4:68:b3:06:23:ed:19:a1:a7:91:09:e8:59:af:82:36:d0:         e1:38:cd:59:ca:66:dc:92:55:60:f8:08:87:6e:0d:a8:45:41:         1a:1a:5a:fc:55:1e:ad:92:a5:7c:4f:8f:d6:8c:d5:6f:11:79:         a9:d1:70:3c:3f:c8:67:de:7a:5c:ce:03:4d:1f:27:43:6e:e2:         3a:bb:84:7b:c3:e1:4d:e3:e4:06:74:d8:5e:59:9b:3f:9f:9a:         4d:41:93:90:3d:3a:4f:47:c1:8b:37:7c:0f:38:db:de:8a:ef:         fc:41:7b:41:65:51:41:9b:9d:14:21:e9:a7:4e:64:e2:59:9f:         f0:d3:b5:1a:30:a7:df:d6:10:83:93:9f:fd:98:e6:54:b8:f3:         cd:c8:14:76:2e:ba:3e:2b:22:08:4d:30:65:0c:2f:a8:18:c9:         37:df:b0:16:2c:70:d4:02:9f:38:c8:0c:4a:e4:2c:17:0b:68:         23:66:d8:95:b6:93:df:b4:cc:e7:39:dc:34:c1:3e:15:fc:c7:         50:9f:ca:56 -----BEGIN CERTIFICATE----- MIIDCTCCAfGgAwIBAgIUPNov/TjS/tWMivZVHqHXCsSCbpcwDQYJKoZIhvcNAQEL BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTI1MDYxNjE4NTQzOVoXDTI1MDcx NjE4NTQzOVowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF AAOCAQ8AMIIBCgKCAQEAybAGXJ+Yd/u9V5lOHis9pW24bJ95Kcol4SpAzSqUMELD oGzTN2b+uOD308FonhzkbzB/18wbsAqHOaRquYmH6bIu/7DzxMpo/GpzTsuELxn4 1p2m1Ki+zqcowsR+8TZrRms2ENkB4Q3AXu2gxSNhXn3wXhgJcwDgdj/6Mg/reAsm anntxPEdM7O65VaCaRoTVpz0t49nhTIdKUZ+nzR18d6mThFT68zjSk/s8eszPDiv JQzFctgiXC/Z08rxPN/xLYbGHoClJ4WZebm8yXGP9r5z6KHF8CkbzFzhcRXctYtc 8+wTGqVcoexCB3//LCetrFs2lPABmj30lBfWLv5L2QIDAQABo1MwUTAdBgNVHQ4E FgQU9TCPZYAPowKWhWuQFAwDbeWmPk4wHwYDVR0jBBgwFoAU9TCPZYAPowKWhWuQ FAwDbeWmPk4wDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEABVH4 D4cZo6vtxeWNCgX16UUurAcWmX8BV/TnUfi861dBlgfFIkzeRSTJV65mmG5BT/xJ zyZizsRoswYj7Rmhp5EJ6FmvgjbQ4TjNWcpm3JJVYPgIh24NqEVBGhpa/FUerZKl fE+P1ozVbxF5qdFwPD/IZ956XM4DTR8nQ27iOruEe8PhTePkBnTYXlmbP5+aTUGT kD06T0fBizd8Dzjb3orv/EF7QWVRQZudFCHpp05k4lmf8NO1GjCn39YQg5Of/Zjm VLjzzcgUdi66PisiCE0wZQwvqBjJN9+wFixw1AKfOMgMSuQsFwtoI2bYlbaT37TM 5zncNME+FfzHUJ/KVg== -----END CERTIFICATE-----
-SSL_KEY=-----BEGIN PRIVATE KEY----- MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDJsAZcn5h3+71X mU4eKz2lbbhsn3kpyiXhKkDNKpQwQsOgbNM3Zv644PfTwWieHORvMH/XzBuwCoc5 pGq5iYfpsi7/sPPEymj8anNOy4QvGfjWnabUqL7OpyjCxH7xNmtGazYQ2QHhDcBe 7aDFI2FeffBeGAlzAOB2P/oyD+t4CyZqee3E8R0zs7rlVoJpGhNWnPS3j2eFMh0p Rn6fNHXx3qZOEVPrzONKT+zx6zM8OK8lDMVy2CJcL9nTyvE83/EthsYegKUnhZl5 ubzJcY/2vnPoocXwKRvMXOFxFdy1i1zz7BMapVyh7EIHf/8sJ62sWzaU8AGaPfSU F9Yu/kvZAgMBAAECggEAVdNmuaaemrxRJARUdkkfWBTbTLoGNO7VdL5mygfq/KiE l/GHZkWZcrIlNALTUqln2hsQ5BNy2tR4G+LoGaE5aYzOLDewXFdoGrXv8KFxVBvg xO9cjZVrcQQ4N72naV0nhFVeMgguoQcZjCvh5NI7/ppoHZpr9vjyC9AI16HnqXKP DsninJQU58tP7LUM+h2o2GTNziAfep6P36wMVdGOYT5heXxDFwHLn5Li38kdoSeG RGvC3b02Ap8qgx5mYJIUs5QV+Yomn/RQRn2BiEC2Q6DNTbu9ganyN8wlct9jNbtx DQ8yW5Y+cJSwSP8zNiwNzh8oUPkG+uImqxoLOpNgkwKBgQD4qJm7V0QGkpVqAHqE vtXMtqvdjphA7G3pTdztyf3qX+SaKD5DXxlDbpa7EaGNyyj1RyaYX4G73T76z0qc k1aliPKhuRwTIzUWsMBPS3TxruayphQUpNSRp6n5dPDCjgVqFCo0Ef8UObYbt0PQ W1+Bd3NKUYfKgFA8q16QYz33KwKBgQDPpGkO7pXdWK1WoFgtbI6OV9Ar2LJdKC0M w7BbeDZ+LeaBz4f/06xfG6FhG3HJ4aU+31OF7qa6I+OCYYWLbnU/7t6ea+Gs0K96 nNLIPMdSjU2DfJ89y5JWJPPZJ8o5qV+w4PBuEcEsdkOW7Lr8P1KSJHTwBWWi4dT+ QM/ei3eHCwKBgADENEUZjcIfbYp4GeiS1gHdhkYWjG2WzPftH4M0Hi48wW2gNiDr CB7nFlvZQBA50hR/daT+ll3H3svTG73Dzn6QH39UHLwKXb2GKfGUn/WmvltKm8E8 iNMyGxoDvEI9QdMD4OVsMMcVLnSDahgYUAEMJzTRb4O2RYkKVi5HwAclAoGASAgi BfMQfDP6FfYUANYK8ihWaA+JeLWqQyZTtLeUN9uWfmvPIxl8T5YXOse5hq5Hk/MH V4v9vM8caquIF2GfPSmRguWr6TaP2XozyREEmIe6XyXJXDeVsVqqWSfriGtQbdzq q1Rvbgws0FuZVk5lR5tsEaPdqU6sg/NZ6Tr6oRcCgYEAzeI7lhVd0ZceYLNxaby2 gra/gnhKah63hL82xqQcyUloIbAFtRBUDMzpDaJzKDOLpOoyaSUsJfjpFjTL7Zx1 Q1PrGGnldJH3YnFPX/JKSfHp4Ohm3pLLVRlMkq8ppj2EWDxXFSafwdDA64QcEctc B5Si2dC9KHSqM6UD2Q8jg8w= -----END PRIVATE KEY-----
-SSL_CA=Certificate:     Data:         Version: 3 (0x2)         Serial Number:             3c:da:2f:fd:38:d2:fe:d5:8c:8a:f6:55:1e:a1:d7:0a:c4:82:6e:97         Signature Algorithm: sha256WithRSAEncryption         Issuer: CN = localhost         Validity             Not Before: Jun 16 18:54:39 2025 GMT             Not After : Jul 16 18:54:39 2025 GMT         Subject: CN = localhost         Subject Public Key Info:             Public Key Algorithm: rsaEncryption                 Public-Key: (2048 bit)                 Modulus:                     00:c9:b0:06:5c:9f:98:77:fb:bd:57:99:4e:1e:2b:                     3d:a5:6d:b8:6c:9f:79:29:ca:25:e1:2a:40:cd:2a:                     94:30:42:c3:a0:6c:d3:37:66:fe:b8:e0:f7:d3:c1:                     68:9e:1c:e4:6f:30:7f:d7:cc:1b:b0:0a:87:39:a4:                     6a:b9:89:87:e9:b2:2e:ff:b0:f3:c4:ca:68:fc:6a:                     73:4e:cb:84:2f:19:f8:d6:9d:a6:d4:a8:be:ce:a7:                     28:c2:c4:7e:f1:36:6b:46:6b:36:10:d9:01:e1:0d:                     c0:5e:ed:a0:c5:23:61:5e:7d:f0:5e:18:09:73:00:                     e0:76:3f:fa:32:0f:eb:78:0b:26:6a:79:ed:c4:f1:                     1d:33:b3:ba:e5:56:82:69:1a:13:56:9c:f4:b7:8f:                     67:85:32:1d:29:46:7e:9f:34:75:f1:de:a6:4e:11:                     53:eb:cc:e3:4a:4f:ec:f1:eb:33:3c:38:af:25:0c:                     c5:72:d8:22:5c:2f:d9:d3:ca:f1:3c:df:f1:2d:86:                     c6:1e:80:a5:27:85:99:79:b9:bc:c9:71:8f:f6:be:                     73:e8:a1:c5:f0:29:1b:cc:5c:e1:71:15:dc:b5:8b:                     5c:f3:ec:13:1a:a5:5c:a1:ec:42:07:7f:ff:2c:27:                     ad:ac:5b:36:94:f0:01:9a:3d:f4:94:17:d6:2e:fe:                     4b:d9                 Exponent: 65537 (0x10001)         X509v3 extensions:             X509v3 Subject Key Identifier:                  F5:30:8F:65:80:0F:A3:02:96:85:6B:90:14:0C:03:6D:E5:A6:3E:4E             X509v3 Authority Key Identifier:                  F5:30:8F:65:80:0F:A3:02:96:85:6B:90:14:0C:03:6D:E5:A6:3E:4E             X509v3 Basic Constraints: critical                 CA:TRUE     Signature Algorithm: sha256WithRSAEncryption     Signature Value:         05:51:f8:0f:87:19:a3:ab:ed:c5:e5:8d:0a:05:f5:e9:45:2e:         ac:07:16:99:7f:01:57:f4:e7:51:f8:bc:eb:57:41:96:07:c5:         22:4c:de:45:24:c9:57:ae:66:98:6e:41:4f:fc:49:cf:26:62:         ce:c4:68:b3:06:23:ed:19:a1:a7:91:09:e8:59:af:82:36:d0:         e1:38:cd:59:ca:66:dc:92:55:60:f8:08:87:6e:0d:a8:45:41:         1a:1a:5a:fc:55:1e:ad:92:a5:7c:4f:8f:d6:8c:d5:6f:11:79:         a9:d1:70:3c:3f:c8:67:de:7a:5c:ce:03:4d:1f:27:43:6e:e2:         3a:bb:84:7b:c3:e1:4d:e3:e4:06:74:d8:5e:59:9b:3f:9f:9a:         4d:41:93:90:3d:3a:4f:47:c1:8b:37:7c:0f:38:db:de:8a:ef:         fc:41:7b:41:65:51:41:9b:9d:14:21:e9:a7:4e:64:e2:59:9f:         f0:d3:b5:1a:30:a7:df:d6:10:83:93:9f:fd:98:e6:54:b8:f3:         cd:c8:14:76:2e:ba:3e:2b:22:08:4d:30:65:0c:2f:a8:18:c9:         37:df:b0:16:2c:70:d4:02:9f:38:c8:0c:4a:e4:2c:17:0b:68:         23:66:d8:95:b6:93:df:b4:cc:e7:39:dc:34:c1:3e:15:fc:c7:         50:9f:ca:56 -----BEGIN CERTIFICATE----- MIIDCTCCAfGgAwIBAgIUPNov/TjS/tWMivZVHqHXCsSCbpcwDQYJKoZIhvcNAQEL BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTI1MDYxNjE4NTQzOVoXDTI1MDcx NjE4NTQzOVowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF AAOCAQ8AMIIBCgKCAQEAybAGXJ+Yd/u9V5lOHis9pW24bJ95Kcol4SpAzSqUMELD oGzTN2b+uOD308FonhzkbzB/18wbsAqHOaRquYmH6bIu/7DzxMpo/GpzTsuELxn4 1p2m1Ki+zqcowsR+8TZrRms2ENkB4Q3AXu2gxSNhXn3wXhgJcwDgdj/6Mg/reAsm anntxPEdM7O65VaCaRoTVpz0t49nhTIdKUZ+nzR18d6mThFT68zjSk/s8eszPDiv JQzFctgiXC/Z08rxPN/xLYbGHoClJ4WZebm8yXGP9r5z6KHF8CkbzFzhcRXctYtc 8+wTGqVcoexCB3//LCetrFs2lPABmj30lBfWLv5L2QIDAQABo1MwUTAdBgNVHQ4E FgQU9TCPZYAPowKWhWuQFAwDbeWmPk4wHwYDVR0jBBgwFoAU9TCPZYAPowKWhWuQ FAwDbeWmPk4wDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEABVH4 D4cZo6vtxeWNCgX16UUurAcWmX8BV/TnUfi861dBlgfFIkzeRSTJV65mmG5BT/xJ zyZizsRoswYj7Rmhp5EJ6FmvgjbQ4TjNWcpm3JJVYPgIh24NqEVBGhpa/FUerZKl fE+P1ozVbxF5qdFwPD/IZ956XM4DTR8nQ27iOruEe8PhTePkBnTYXlmbP5+aTUGT kD06T0fBizd8Dzjb3orv/EF7QWVRQZudFCHpp05k4lmf8NO1GjCn39YQg5Of/Zjm VLjzzcgUdi66PisiCE0wZQwvqBjJN9+wFixw1AKfOMgMSuQsFwtoI2bYlbaT37TM 5zncNME+FfzHUJ/KVg== -----END CERTIFICATE-----
diff --git a/infrastructure/docker/docker-compose.database.yml b/infrastructure/docker/docker-compose.database.yml
@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   postgres:
-    image: ghcr.io/kesha123/nodejs-rest-api/postgres:${DATABASE_IMAGE_TAG:-latest}
+    image: postgres:${DATABASE_IMAGE_TAG:-latest}
     container_name: postgres
     command: >
       -c ssl=on
@@ -26,20 +26,10 @@ services:
       timeout: 5s
       retries: 5
 
-  migrations:
-    image: ghcr.io/kesha123/nodejs-rest-api/migrations:${MIGRATIONS_IMAGE_TAG:-latest}
-    env_file:
-      - .env
-    depends_on:
-      - postgres
-
 
 networks:
   nodejs-rest-api:
     driver: bridge
-    ipam:
-      config:
-        - subnet: 172.28.0.0/16
 
 
 volumes:
diff --git a/infrastructure/docker/docker-compose.yaml b/infrastructure/docker/docker-compose.yaml
@@ -1,16 +1,12 @@
 version: "3.8"
 
 
-include:
-  - docker-compose.database.yaml
-
-
 services:
   nginx-proxy:
-    image: ghcr.io/kesha123/nodejs-rest-api/nginx-proxy:${NGINX_PROXY_IMAGE_TAG:-stable-alpine3.21}
+    image: nginx:${NGINX_PROXY_IMAGE_TAG:-stable-alpine3.21}
     container_name: nginx-proxy
     volumes:
-      - ./nginx/nginx.conf:/etc/nginx/nginx.conf
+      - ./nginx.conf:/etc/nginx/nginx.conf:ro
     networks:
       - nodejs-rest-api
     ports:
@@ -22,10 +18,15 @@ services:
   api:
     image: ghcr.io/kesha123/nodejs-rest-api/api:${API_IMAGE_TAG:-latest}
     container_name: api
+    volumes:
+      - ./ssl/privkey.pem:/app/ssl/privkey.pem
+      - ./ssl/server.crt:/app/ssl/server.crt
+      - ./ssl/server.key.bak:/app/ssl/server.key
     env_file:
       - .env
-    depends_on:
-      - postgres
-      - migrations
     networks:
       - nodejs-rest-api
+
+networks:
+  nodejs-rest-api:
+    driver: bridge
diff --git a/infrastructure/docker/nginx.conf b/infrastructure/docker/nginx.conf
@@ -2,11 +2,12 @@ events {
   worker_connections 1024;
 }
 
-upstream api {
-    server api:3000;
-}
-
 http {
+
+  upstream api {
+      server api:3000;
+  }
+
   server {
     listen 80;
 
@@ -17,4 +18,5 @@ http {
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto $scheme;
     }
+  }
 }
diff --git a/infrastructure/docker/ssl/privkey.pem b/infrastructure/docker/ssl/privkey.pem
diff --git a/infrastructure/docker/ssl/server.crt b/infrastructure/docker/ssl/server.crt
diff --git a/infrastructure/docker/ssl/server.key b/infrastructure/docker/ssl/server.key
diff --git a/infrastructure/docker/ssl/server.req b/infrastructure/docker/ssl/server.req
