Merge branch 'release/2.1.2'

Author: DavidsonGomes

.env.example

@@ -5,6 +5,8 @@ SERVER_URL=http://localhost:8080
 
 SENTRY_DSN=
 
+TZ=America/Sao_Paulo
+
 # Cors - * for all or set separate by commas -  ex.: 'yourdomain1.com, yourdomain2.com'
 CORS_ORIGIN=*
 CORS_METHODS=GET,POST,PUT,DELETE

Docker/minio/docker-compose.yaml

@@ -1,8 +1,8 @@
 version: "3.7"
 
 services:
-  evolution_v2:
-    image: atendai/evolution-api-lite:v2.1.2
+  evolution_v2_lite:
+    image: atendai/evolution-api-lite:latest
     volumes:
       - evolution_instances:/evolution/instances
     networks:
@@ -19,10 +19,10 @@ services:
       - DATABASE_SAVE_DATA_CHATS=true
       - DATABASE_SAVE_DATA_LABELS=true
       - DATABASE_SAVE_DATA_HISTORIC=true
-      - DATABASE_CONNECTION_CLIENT_NAME=evolution_v2
+      - DATABASE_CONNECTION_CLIENT_NAME=evolution_v2_lite
       - RABBITMQ_ENABLED=false
       - RABBITMQ_URI=amqp://admin:admin@rabbitmq:5672/default
-      - RABBITMQ_EXCHANGE_NAME=evolution_v2
+      - RABBITMQ_EXCHANGE_NAME=evolution_v2_lite
       - RABBITMQ_GLOBAL_ENABLED=false
       - RABBITMQ_EVENTS_APPLICATION_STARTUP=false
       - RABBITMQ_EVENTS_INSTANCE_CREATE=false
@@ -96,16 +96,9 @@ services:
       - QRCODE_LIMIT=30
       - CACHE_REDIS_ENABLED=true
       - CACHE_REDIS_URI=redis://evo_redis:6379/1
-      - CACHE_REDIS_PREFIX_KEY=evolution_v2
+      - CACHE_REDIS_PREFIX_KEY=evolution_v2_lite
       - CACHE_REDIS_SAVE_INSTANCES=false
       - CACHE_LOCAL_ENABLED=false
-      - S3_ENABLED=true
-      - S3_ACCESS_KEY=
-      - S3_SECRET_KEY=
-      - S3_BUCKET=evolution
-      - S3_PORT=443
-      - S3_ENDPOINT=files.site.com
-      - S3_USE_SSL=true
       - AUTHENTICATION_API_KEY=429683C4C977415CAAFCCE10F7D57E11
       - AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES=true
       - LANGUAGE=en
@@ -117,18 +110,18 @@ services:
           - node.hostname == evolution-manager
       labels:
         - traefik.enable=true
-        - traefik.http.routers.evolution_v2.rule=Host(`evo2.site.com`)
-        - traefik.http.routers.evolution_v2.entrypoints=websecure
-        - traefik.http.routers.evolution_v2.tls.certresolver=letsencryptresolver
-        - traefik.http.routers.evolution_v2.priority=1
-        - traefik.http.routers.evolution_v2.service=evolution_v2
-        - traefik.http.services.evolution_v2.loadbalancer.server.port=8080
-        - traefik.http.services.evolution_v2.loadbalancer.passHostHeader=true
+        - traefik.http.routers.evolution_v2_lite.rule=Host(`evo2.site.com`)
+        - traefik.http.routers.evolution_v2_lite.entrypoints=websecure
+        - traefik.http.routers.evolution_v2_lite.tls.certresolver=letsencryptresolver
+        - traefik.http.routers.evolution_v2_lite.priority=1
+        - traefik.http.routers.evolution_v2_lite.service=evolution_v2_lite
+        - traefik.http.services.evolution_v2_lite.loadbalancer.server.port=8080
+        - traefik.http.services.evolution_v2_lite.loadbalancer.passHostHeader=true
 
 volumes:
   evolution_instances:
     external: true
-    name: evolution_v2_data
+    name: evolution_v2_lite_data
 
 networks:
   network_public:

Docker/swarm/evolution_api_v2.yaml

@@ -1,58 +1,36 @@
 FROM node:20-alpine AS builder
 
-RUN apk update && \
-    apk add git wget curl bash
-
-LABEL version="2.1.2-lite" description="Api to control whatsapp features through http requests." 
-LABEL maintainer="Davidson Gomes" git="https://github.com/EvolutionAPI"
-LABEL contact="davidson@evolution-api.com"
+RUN apk add git wget curl bash
 
 WORKDIR /evolution
 
 COPY ./package.json ./tsconfig.json ./
-
 RUN npm install --omit=dev
 
+RUN rm -rf /var/cache/apk/*
+
 COPY ./src ./src
 COPY ./public ./public
 COPY ./prisma ./prisma
-COPY ./manager ./manager
 COPY ./.env.example ./.env
 COPY ./runWithProvider.js ./
 COPY ./tsup.config.ts ./
-
 COPY ./Docker ./Docker
 
-RUN chmod +x ./Docker/scripts/* && dos2unix ./Docker/scripts/*
-
-RUN ./Docker/scripts/generate_database.sh
-
-RUN npm run build
+RUN chmod +x ./Docker/scripts/* && dos2unix ./Docker/scripts/* && \
+    ./Docker/scripts/generate_database.sh && \
+    npm run build
 
 FROM node:20-alpine AS final
 
-RUN apk update && \
-    apk add tzdata bash
-
-ENV TZ=America/Sao_Paulo
+RUN apk add git wget curl bash
 
 WORKDIR /evolution
 
-COPY --from=builder /evolution/package.json ./package.json
-COPY --from=builder /evolution/package-lock.json ./package-lock.json
-
-COPY --from=builder /evolution/node_modules ./node_modules
-COPY --from=builder /evolution/dist ./dist
-COPY --from=builder /evolution/prisma ./prisma
-COPY --from=builder /evolution/manager ./manager
-COPY --from=builder /evolution/public ./public
-COPY --from=builder /evolution/.env ./.env
-COPY --from=builder /evolution/Docker ./Docker
-COPY --from=builder /evolution/runWithProvider.js ./runWithProvider.js
-COPY --from=builder /evolution/tsup.config.ts ./tsup.config.ts
+COPY --from=builder /evolution ./
 
 ENV DOCKER_ENV=true
 
 EXPOSE 8080
 
-ENTRYPOINT ["/bin/bash", "-c", ". ./Docker/scripts/deploy_database.sh && npm run start:prod" ]
+ENTRYPOINT ["/bin/bash", "-c", "npm run start:prod" ]