From 39902115fff2c5a7e6428df58a2b218b6837f086 Mon Sep 17 00:00:00 2001 From: Javad Zarezadeh Date: Tue, 23 Jul 2024 18:08:32 +0330 Subject: [PATCH 1/7] Update docker-compose.yml Change postgres version tag to a more recent one --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9d1c6bb438..56e56301f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: db: - image: postgres:12 + image: postgres:16 restart: always volumes: - app-db-data:/var/lib/postgresql/data/pgdata From 95d363c906c774cba5d1ae21c4f77c0dae61449a Mon Sep 17 00:00:00 2001 From: Javad Zarezadeh Date: Sun, 4 Aug 2024 15:34:51 +0330 Subject: [PATCH 2/7] Update some docker container versions Update Node and Traefik versions --- docker-compose.override.yml | 2 +- docker-compose.traefik.yml | 2 +- frontend/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 418b535ab6..16ef1e3178 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,7 +1,7 @@ services: proxy: - image: traefik:3.0 + image: traefik:comte volumes: - /var/run/docker.sock:/var/run/docker.sock ports: diff --git a/docker-compose.traefik.yml b/docker-compose.traefik.yml index 886d6dcc2f..702a8753d2 100644 --- a/docker-compose.traefik.yml +++ b/docker-compose.traefik.yml @@ -1,6 +1,6 @@ services: traefik: - image: traefik:3.0 + image: traefik:comte ports: # Listen on port 80, default for HTTP, necessary to redirect to HTTPS - 80:80 diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 8728c7b029..9d900d5616 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,5 +1,5 @@ # Stage 0, "build-stage", based on Node.js, to build and compile the frontend -FROM node:20 AS build-stage +FROM node:lts AS build-stage WORKDIR /app From c55feee4da27c3779250eb17bcb5bb8f4ddfd815 Mon Sep 17 00:00:00 2001 From: Javad Zarezadeh Date: Mon, 5 Aug 2024 12:22:28 +0330 Subject: [PATCH 3/7] update uvicorn-gunicorn-fastapi --- backend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index c3187aeb28..bb7144abe9 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM tiangolo/uvicorn-gunicorn-fastapi:python3.10 +FROM tiangolo/uvicorn-gunicorn-fastapi:latest WORKDIR /app/ From ca950daacbb751aab2df25ec28d55001b63c4f00 Mon Sep 17 00:00:00 2001 From: Javad Zarezadeh Date: Sun, 22 Sep 2024 20:31:07 +0330 Subject: [PATCH 4/7] Update python version to latest stable version 3 --- backend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index bb67c32a81..2152a8a910 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10 +FROM python:3 WORKDIR /app/ From fc52a3cdf039ecfa8d7d7f47b2dd74ea562724c5 Mon Sep 17 00:00:00 2001 From: Javad Zarezadeh Date: Mon, 14 Oct 2024 14:37:51 +0330 Subject: [PATCH 5/7] Change Docker images versions --- backend/Dockerfile | 2 +- docker-compose.override.yml | 2 +- docker-compose.traefik.yml | 2 +- docker-compose.yml | 2 +- frontend/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index edfdb6fe4a..553d8ffb8c 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3 +FROM python:3:10 ENV PYTHONUNBUFFERED=1 diff --git a/docker-compose.override.yml b/docker-compose.override.yml index c92e777908..dedfa204ce 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -6,7 +6,7 @@ services: # etc. To enable it, update .env, set: # DOMAIN=localhost.tiangolo.com proxy: - image: traefik:comte + image: traefik:3.1 volumes: - /var/run/docker.sock:/var/run/docker.sock ports: diff --git a/docker-compose.traefik.yml b/docker-compose.traefik.yml index 702a8753d2..0c2d2dc5d7 100644 --- a/docker-compose.traefik.yml +++ b/docker-compose.traefik.yml @@ -1,6 +1,6 @@ services: traefik: - image: traefik:comte + image: traefik:3.1 ports: # Listen on port 80, default for HTTP, necessary to redirect to HTTPS - 80:80 diff --git a/docker-compose.yml b/docker-compose.yml index a4d21539ce..b1aa17ed43 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ services: db: - image: postgres:16 + image: postgres:17 restart: always healthcheck: test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"] diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 9d900d5616..8728c7b029 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,5 +1,5 @@ # Stage 0, "build-stage", based on Node.js, to build and compile the frontend -FROM node:lts AS build-stage +FROM node:20 AS build-stage WORKDIR /app From 40167661b844b2a7e2f5e37619cb445bc7ad32c1 Mon Sep 17 00:00:00 2001 From: Javad Zarezadeh Date: Mon, 14 Oct 2024 15:06:07 +0330 Subject: [PATCH 6/7] Fix Python version --- backend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 553d8ffb8c..9d6e699f30 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3:10 +FROM python:3.10 ENV PYTHONUNBUFFERED=1 From e39fcf4b1b8c961a4eb3b41e707b9d9019871464 Mon Sep 17 00:00:00 2001 From: Javad Zarezadeh Date: Sun, 29 Dec 2024 12:07:04 +0330 Subject: [PATCH 7/7] Upgrade Traefik to v3.2 --- docker-compose.override.yml | 2 +- docker-compose.traefik.yml | 4 ++-- docker-compose.yml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 41cbf4e146..4d4bf7a189 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -6,7 +6,7 @@ services: # etc. To enable it, update .env, set: # DOMAIN=localhost.tiangolo.com proxy: - image: traefik:3.1 + image: traefik:3.2 volumes: - /var/run/docker.sock:/var/run/docker.sock ports: diff --git a/docker-compose.traefik.yml b/docker-compose.traefik.yml index 0c2d2dc5d7..4b78c1382a 100644 --- a/docker-compose.traefik.yml +++ b/docker-compose.traefik.yml @@ -1,6 +1,6 @@ services: traefik: - image: traefik:3.1 + image: traefik:3.2 ports: # Listen on port 80, default for HTTP, necessary to redirect to HTTPS - 80:80 @@ -11,7 +11,7 @@ services: # Enable Traefik for this service, to make it available in the public network - traefik.enable=true # Use the traefik-public network (declared below) - - traefik.docker.network=traefik-public + - traefik.swarm.network=traefik-public # Define the port inside of the Docker service to use - traefik.http.services.traefik-dashboard.loadbalancer.server.port=8080 # Make Traefik use this domain (from an environment variable) in HTTP diff --git a/docker-compose.yml b/docker-compose.yml index b1aa17ed43..db083af8fc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ services: - ADMINER_DESIGN=pepa-linha-dark labels: - traefik.enable=true - - traefik.docker.network=traefik-public + - traefik.swarm.network=traefik-public - traefik.constraint-label=traefik-public - traefik.http.routers.${STACK_NAME?Variable not set}-adminer-http.rule=Host(`adminer.${DOMAIN?Variable not set}`) - traefik.http.routers.${STACK_NAME?Variable not set}-adminer-http.entrypoints=http @@ -118,7 +118,7 @@ services: context: ./backend labels: - traefik.enable=true - - traefik.docker.network=traefik-public + - traefik.swarm.network=traefik-public - traefik.constraint-label=traefik-public - traefik.http.services.${STACK_NAME?Variable not set}-backend.loadbalancer.server.port=8000 @@ -147,7 +147,7 @@ services: - NODE_ENV=production labels: - traefik.enable=true - - traefik.docker.network=traefik-public + - traefik.swarm.network=traefik-public - traefik.constraint-label=traefik-public - traefik.http.services.${STACK_NAME?Variable not set}-frontend.loadbalancer.server.port=80