Standardize ordering of docker compose files and naming conventions

Author: peter-rauscher

docker-compose.prod.init.yaml docker-compose.prod.init.ymldocker-compose.prod.init.yaml renamed to docker-compose.prod.init.yml

@@ -1,7 +1,7 @@
 services:
   nginx:
-    image: nginx:alpine
     container_name: solesearch_nginx
+    image: nginx:alpine
     ports:
       - "80:80"
     volumes:
@@ -12,13 +12,13 @@ services:
       - ".env"
 
   certbot:
+    container_name: solesearch_certbot  
     image: certbot/certbot:latest
-    container_name: solesearch_certbot
     command: certonly --reinstall --webroot --webroot-path=/var/www/certbot --email ${EMAIL} --agree-tos --no-eff-email -d ${DOMAIN}
-    depends_on:
-      - nginx
     volumes:
       - ./nginx/certbot/etc/letsencrypt:/etc/letsencrypt
       - ./nginx/certbot/var/www/certbot:/var/www/certbot
+    depends_on:
+      - nginx
     env_file:
       - ".env"

docker-compose.prod.yml

@@ -1,15 +1,16 @@
-services:
+version: "3.8"
 
+services:
   api:
     container_name: solesearch_api
     image: peterrauscher/solesearch-api:latest
-    depends_on:
-      - db
-      - redis
     volumes:
       - ~/solesearch/api/data:/var/data/solesearch
     networks:
       - solesearch_network
+    depends_on:
+      - db
+      - redis
     restart: always
     env_file:
       - ".env"
@@ -18,14 +19,14 @@ services:
     container_name: solesearch_worker
     image: peterrauscher/solesearch-api:latest
     command: celery -A solesearch_api.tasks worker --loglevel=info
-    depends_on:
-      - api
-      - redis
-      - rabbitmq
     volumes:
       - ~/solesearch/api/data:/var/data/solesearch
     networks:
       - solesearch_network
+    depends_on:
+      - api
+      - redis
+      - rabbitmq
     restart: always
     env_file:
       - ".env"
@@ -34,43 +35,43 @@ services:
     container_name: solesearch_beat
     image: peterrauscher/solesearch-api:latest
     command: celery -A solesearch_api.tasks beat --loglevel=info
-    depends_on:
-      - api
-      - redis
-      - rabbitmq
     volumes:
       - ~/solesearch/api/data:/var/data/solesearch
     networks:
       - solesearch_network
+    depends_on:
+      - api
+      - redis
+      - rabbitmq
     restart: always
     env_file:
       - ".env"
 
   db:
-    image: postgres:16-alpine
     container_name: solesearch_db
-    env_file:
-      - ".env"
-    volumes:
-      - postgres_data:/var/lib/postgresql/data
+    image: postgres:16-alpine
     ports:
       - "5432:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
     networks:
       - solesearch_network
     restart: always
+    env_file:
+      - ".env"
 
   redis:
-    image: redis:alpine
     container_name: solesearch_redis
+    image: redis:alpine
     volumes:
       - redis_data:/data
     networks:
       - solesearch_network
     restart: always
 
   rabbitmq:
-    image: rabbitmq:management-alpine
     container_name: solesearch_rabbitmq
+    image: rabbitmq:management-alpine
     ports:
       - "15672:15672"
     networks:
@@ -89,11 +90,13 @@ services:
       - ./nginx/templates:/etc/nginx/templates
       - ./nginx/certbot/etc/letsencrypt:/etc/letsencrypt
       - ./nginx/certbot/var/www/certbot:/var/www/certbot
-    depends_on:
-      - api
     networks:
       - solesearch_network
+    depends_on:
+      - api
     restart: always
+    env_file:
+      - ".env"
 
   certbot:
     image: certbot/certbot:latest

docker-compose.yml

@@ -1,86 +1,91 @@
+version: "3.8"
+
 services:
   api:
+    container_name: solesearch_api
     build:
       context: .
       args:
         - ENVIRONMENT=development
-    container_name: solesearch_api
-    depends_on:
-      - db
-      - redis
+    ports:
+      - "8000:8000"
     volumes:
       - ~/solesearch/api/data:/var/data/solesearch
     networks:
       - solesearch_network
+    depends_on:
+      - db
+      - redis
     restart: always
     env_file:
       - ".env"
 
   celery_worker:
+    container_name: solesearch_worker
     build:
       context: .
       args:
         - ENVIRONMENT=development
-    container_name: solesearch_worker
     command: celery -A solesearch_api.tasks worker --loglevel=info
-    depends_on:
-      - api
-      - redis
-      - rabbitmq
     volumes:
       - ~/solesearch/api/data:/var/data/solesearch
     networks:
       - solesearch_network
+    depends_on:
+      - api
+      - redis
+      - rabbitmq
     restart: always
     env_file:
       - ".env"
 
   celery_beat:
+    container_name: solesearch_beat
     build:
       context: .
       args:
         - ENVIRONMENT=development
-    container_name: solesearch_beat
     command: celery -A solesearch_api.tasks beat --loglevel=info
-    depends_on:
-      - api
-      - redis
-      - rabbitmq
     volumes:
       - ~/solesearch/api/data:/var/data/solesearch
     networks:
       - solesearch_network
+    depends_on:
+      - api
+      - redis
+      - rabbitmq
     restart: always
     env_file:
       - ".env"
 
   db:
-    image: postgres:16-alpine
     container_name: solesearch_db
-    env_file:
-      - ".env"
-    volumes:
-      - postgres_data:/var/lib/postgresql/data
+    image: postgres:16-alpine
     ports:
       - "5432:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
     networks:
       - solesearch_network
     restart: always
+    env_file:
+      - ".env"
+    
 
   redis:
-    image: redis:alpine
     container_name: solesearch_redis
-    volumes:
-      - redis_data:/data
+    image: redis:alpine
     ports:
       - "6379:6379"
+    volumes:
+      - redis_data:/data
     networks:
       - solesearch_network
     restart: always
 
   rabbitmq:
-    image: rabbitmq:management-alpine
     container_name: solesearch_rabbitmq
+    image: rabbitmq:management-alpine
     ports:
       - "15672:15672"
     networks:

install.sh

@@ -1,16 +1,16 @@
 #!/bin/bash
 
 # Create the certificate for the first time
-docker-compose -f ./docker-compose.prod.init.yaml up -d nginx
-docker-compose -f ./docker-compose.prod.init.yaml up certbot
-docker-compose -f ./docker-compose.prod.init.yaml down
+docker-compose -f ./docker-compose.prod.init.yml up -d nginx
+docker-compose -f ./docker-compose.prod.init.yml up certbot
+docker-compose -f ./docker-compose.prod.init.yml down
 
 # Copy the configuration files down
 curl -L --create-dirs -o nginx/certbot/etc/letsencrypt/options-ssl-nginx.conf https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf
 openssl dhparam -out nginx/certbot/etc/letsencrypt/ssl-dhparams.pem 2048
 
 # Start the production services
-docker-compose -f ./docker-compose.prod.yaml up -d
+docker-compose -f ./docker-compose.prod.yml up -d
 
 # Add the cron job
 echo "0 5 * * *  $(pwd)/renew_cert.sh" | crontab -

renew_cert.sh

@@ -8,5 +8,5 @@ else
 fi
 
 # renew certbot certificate
-docker-compose -f ./docker-compose.prod.yaml run --rm certbot
-docker-compose -f ./docker-compose.prod.yaml exec nginx nginx -s reload
+docker-compose -f ./docker-compose.prod.yml run --rm certbot
+docker-compose -f ./docker-compose.prod.yml exec nginx nginx -s reload