From 3718090fae81fcd157e56b190ef9fbd6fc1408e7 Mon Sep 17 00:00:00 2001 From: Mahdi Khanzadi Date: Thu, 16 Jan 2025 00:14:35 +0100 Subject: [PATCH] fix mongo-dashboard --- Makefile | 1 - compose.docker.yaml | 2 +- compose.docker_dashboard.yaml | 2 +- compose.mongodb.yaml | 2 +- compose.mongodb_dashboard.yaml | 9 ++++++--- compose.nats.yaml | 2 +- compose.proxy.yaml | 2 +- resources.tf | 21 +++++++++++---------- 8 files changed, 22 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 5d44f15..9921130 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,6 @@ export MONGO_PASSWORD = test‍ export DASHBOARD_MONGO_USERNAME = username export DASHBOARD_MONGO_PASSWORD = password -export DASHBOARD_MONGO_MONGODB_URL = mongodb://${MONGO_USERNAME}:${MONGO_PASSWORD}@mongodb:27017 export PROXY_IMAGE = ghcr.io/tarhche/proxy:latest diff --git a/compose.docker.yaml b/compose.docker.yaml index 300f2b5..f7d3b8a 100644 --- a/compose.docker.yaml +++ b/compose.docker.yaml @@ -6,7 +6,7 @@ services: deploy: mode: replicated replicas: 1 - endpoint_mode: vip + endpoint_mode: dnsrr restart_policy: condition: on-failure delay: 5s diff --git a/compose.docker_dashboard.yaml b/compose.docker_dashboard.yaml index 9e5ed60..d40591b 100644 --- a/compose.docker_dashboard.yaml +++ b/compose.docker_dashboard.yaml @@ -7,7 +7,7 @@ services: deploy: mode: replicated replicas: 1 - endpoint_mode: vip + endpoint_mode: dnsrr restart_policy: condition: on-failure delay: 5s diff --git a/compose.mongodb.yaml b/compose.mongodb.yaml index 39e715f..53ab8e7 100644 --- a/compose.mongodb.yaml +++ b/compose.mongodb.yaml @@ -6,7 +6,7 @@ services: deploy: mode: replicated replicas: 1 - endpoint_mode: vip + endpoint_mode: dnsrr restart_policy: condition: on-failure delay: 5s diff --git a/compose.mongodb_dashboard.yaml b/compose.mongodb_dashboard.yaml index d14439d..20b088c 100644 --- a/compose.mongodb_dashboard.yaml +++ b/compose.mongodb_dashboard.yaml @@ -1,13 +1,13 @@ services: mongodb_dashboard: - image: mongo-express + image: mongo-express:1-20-alpine3.19 networks: - mongodb - mongodb_dashboard deploy: mode: replicated replicas: 1 - endpoint_mode: vip + endpoint_mode: dnsrr restart_policy: condition: on-failure delay: 5s @@ -17,9 +17,12 @@ services: cpus: '0.20' memory: 150M environment: + ME_CONFIG_MONGODB_SERVER: mongodb + ME_CONFIG_MONGODB_PORT: 27017 ME_CONFIG_BASICAUTH_USERNAME: ${DASHBOARD_MONGO_USERNAME} ME_CONFIG_BASICAUTH_PASSWORD: ${DASHBOARD_MONGO_PASSWORD} - ME_CONFIG_MONGODB_URL: ${DASHBOARD_MONGO_MONGODB_URL} + ME_CONFIG_MONGODB_ADMINUSERNAME: ${MONGO_USERNAME} + ME_CONFIG_MONGODB_ADMINPASSWORD: ${MONGO_PASSWORD} networks: mongodb_dashboard: diff --git a/compose.nats.yaml b/compose.nats.yaml index 7eca4b0..d976627 100644 --- a/compose.nats.yaml +++ b/compose.nats.yaml @@ -6,7 +6,7 @@ services: deploy: mode: replicated replicas: 1 - endpoint_mode: vip + endpoint_mode: dnsrr restart_policy: condition: on-failure delay: 5s diff --git a/compose.proxy.yaml b/compose.proxy.yaml index 2ad6ecf..c90dd6a 100644 --- a/compose.proxy.yaml +++ b/compose.proxy.yaml @@ -10,7 +10,7 @@ services: deploy: mode: replicated replicas: 1 - endpoint_mode: vip + endpoint_mode: dnsrr restart_policy: condition: on-failure delay: 5s diff --git a/resources.tf b/resources.tf index 796316b..8910fb6 100644 --- a/resources.tf +++ b/resources.tf @@ -86,23 +86,23 @@ resource "aws_volume_attachment" "backend" { import { to = aws_instance.backend - id = "i-06d3dcfc254a1de52" + id = "i-0e901470df299a6e7" } resource "aws_instance" "backend" { - ami = "ami-02d9d83052ced9fdd" # Canonical, Ubuntu, 24.04, arm noble image - instance_type = "t4g.small" + ami = "ami-07eef52105e8a2059" # Canonical, Ubuntu, 24.04, amd64 noble image + instance_type = "t3.medium" key_name = "backend" availability_zone = "eu-central-1b" user_data = <<-EOT #!/bin/bash - # volumes - sudo mkfs.ext4 /dev/xvdf + # volumes - ec2 modifies the device name xvdf to nvme1n1 + sudo mkfs.ext4 /dev/nvme1n1 sudo mkdir /volume_01 - sudo mount /dev/xvdf /volume_01 - sudo echo "/dev/xvdf /volume_01 ext4 defaults,nofail 0 0" | sudo tee -a /etc/fstab + sudo mount /dev/nvme1n1 /volume_01 + sudo echo "/dev/nvme1n1 /volume_01 ext4 defaults,nofail 0 0" | sudo tee -a /etc/fstab # tools sudo apt install -y wget python3 ca-certificates curl htop jq vim make @@ -121,9 +121,9 @@ resource "aws_instance" "backend" { # install docker and sysbox sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin - wget https://downloads.nestybox.com/sysbox/releases/v0.6.6/sysbox-ce_0.6.6-0.linux_arm64.deb - sudo apt install -y ./sysbox-ce_0.6.6-0.linux_arm64.deb - rm ./sysbox-ce_0.6.6-0.linux_arm64.deb + wget -O sysbox.deb https://downloads.nestybox.com/sysbox/releases/v0.6.6/sysbox-ce_0.6.6-0.linux_amd64.deb + sudo apt install -y ./sysbox.deb + rm ./sysbox.deb # setup sudo systemctl enable docker.service @@ -225,6 +225,7 @@ resource "aws_lb_target_group" "http" { } # can't be imported, that's why the below lines are commented +# - if it's the first time you create the ec2, uncomment the below code # resource "aws_lb_target_group_attachment" "backend_http" { # target_group_arn = aws_lb_target_group.http.arn # target_id = aws_instance.backend.id