🚀 update docker services to be compatible with kubernetes

agn-7 · Sep 14, 2023 · 6bdc202 · 6bdc202
1 parent b1a1527
commit 6bdc202
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/bitpin/bitpin/product_settings.py b/bitpin/bitpin/product_settings.py
@@ -7,8 +7,8 @@
         "NAME": "bitpin_db",
         "USER": "bitpin_usr",
         "PASSWORD": "root",
-        "HOST": "bitpin_db",
-        "PORT": "",
+        "HOST": "bitpin-db-service",
+        "PORT": "5432",
         "TEST": {
             "NAME": "bitpin_test_db",
         },

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,13 +13,13 @@ services:
       - "./bitpin/static:/code/static:ro"
       - "./nginx/nginx.conf:/etc/nginx/conf.d/nginx.conf:ro"
     depends_on:
-      - bitpin_app
+      - bitpin-app-service
     logging:
       driver: "json-file"
       options:
         max-size: "50m"
 
-  bitpin_db:
+  bitpin-db-service:
     image: postgres:11-alpine
     restart: unless-stopped
     expose:
@@ -36,7 +36,7 @@ services:
       options:
         max-size: "50m"
 
-  bitpin_app:
+  bitpin-app-service:
     build: .
     image: bitpin:1.0.0
     container_name: bitpin_app
@@ -52,7 +52,7 @@ services:
       - "80"
       - "8000"
     depends_on:
-      - bitpin_db
+      - bitpin-db-service
     logging:
       driver: "json-file"
       options:
@@ -63,7 +63,7 @@ services:
     hostname: pgadmin
     image: dpage/pgadmin4
     depends_on:
-      - bitpin_db
+      - bitpin-db-service
     environment:
       PGADMIN_DEFAULT_EMAIL: admin@ava.com
       PGADMIN_DEFAULT_PASSWORD: admin

diff --git a/k8s/deployment/bitpin-app-deployment.yml b/k8s/deployment/bitpin-app-deployment.yml
@@ -15,7 +15,7 @@ spec:
       containers:
         - name: bitpin-app
           image: localhost:5000/bitpin:1.0.0
-          imagePullPolicy: IfNotPresent
+          imagePullPolicy: IfNotPresent  # for development change it to Always
           command: ["bash", "start.sh"]
           ports:
             - containerPort: 8000

diff --git a/k8s/service/bitpin-app-service.yml b/k8s/service/bitpin-app-service.yml
@@ -7,6 +7,6 @@ spec:
     app: bitpin-app
   ports:
   - name: http
-    port: 80
+    port: 8000
     targetPort: 8000
   type: ClusterIP
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
@@ -1,5 +1,5 @@
 upstream bitpin {
-    server bitpin_app:8000;
+    server bitpin-app-service:8000;
 }
 
 limit_req_zone $binary_remote_addr zone=one:10m rate=50r/s;