fix(docker): correct build errors, dead code and missing config

.docker/add-env-vars.sh

@@ -1,33 +1,7 @@
 _writeFrontendEnvVars() {
-    ENV_JSON="$(jq --compact-output --null-input 'env | with_entries(select(.key | startswith("REACT_APP_")))')"
+    ENV_JSON="$(jq --compact-output --null-input 'env | with_entries(select(.key | startswith("VITE_")))')"
     ENV_JSON_ESCAPED="$(printf "%s" "${ENV_JSON}" | sed -e 's/[\&/]/\\&/g')"
     sed -i "s/<noscript id=\"env-insertion-point\"><\/noscript>/<script>var ENV=${ENV_JSON_ESCAPED}<\/script>/g" ${PUBLIC_HTML}index.html
 }
 
-_writeNginxEnvVars() {
-    dockerize -template /etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
-}
-
-_addSslConfig() {
-    SSL_CERTIFICATE=/etc/nginx/ssl/${1}/fullchain.pem;
-    SSL_CERTIFICATE_KEY=/etc/nginx/ssl/${1}/privkey.pem;
-    FILE_CONF=/etc/nginx/sites.d/${1}.conf
-    FILE_SSL_CONF=/etc/nginx/conf.d/00-ssl-redirect.conf;
-
-    if [ -f ${SSL_CERTIFICATE} ] && [ -f ${SSL_CERTIFICATE_KEY} ]; then
-        echo "saving ssl config in ${FILE_CONF}"
-        echo 'include include.d/ssl-redirect.conf;' >> ${FILE_SSL_CONF};
-        echo 'include "include.d/ssl.conf";' >> ${FILE_CONF};
-        echo "ssl_certificate ${SSL_CERTIFICATE};" >> ${FILE_CONF};
-        echo "ssl_certificate_key ${SSL_CERTIFICATE_KEY};" >> ${FILE_CONF};
-    else
-        echo 'listen 80;' >> ${FILE_CONF};
-        echo "ssl ${1} not found >> ${SSL_CERTIFICATE} -> ${SSL_CERTIFICATE_KEY}"
-    fi;
-}
-
 _writeFrontendEnvVars;
-_writeNginxEnvVars;
-
-# _addSslConfig 'backend'
-# _addSslConfig 'frontend'

.dockerignore

@@ -0,0 +1,16 @@
+node_modules/
+dist/
+build/
+.git/
+.gitignore
+.github/
+*.log
+.env
+.env.*
+.DS_Store
+Thumbs.db
+*.tsbuildinfo
+tmp/
+temp/
+coverage/
+.nyc_output/

Dockerfile

@@ -15,8 +15,6 @@ COPY tsconfig.json ./
 COPY tsconfig.app.json ./
 COPY tsconfig.node.json ./
 COPY vite.config.ts ./
-COPY postcss.config.js ./
-COPY tailwind.config.js ./
 COPY index.html ./
 COPY components.json ./
 COPY public/ ./public/

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   evolution-manager:
     build:
@@ -9,8 +7,11 @@ services:
       - "3000:80"
     container_name: evolution-manager-v2
     restart: unless-stopped
-    environment:
-      - NODE_ENV=production
+    healthcheck:
+      test: ["CMD", "wget", "-q", "--spider", "http://localhost/health"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
     networks:
       - evolution-network
 

docker_build.sh

@@ -1,5 +1,12 @@
 #!/bin/bash
-VERSION=$1
+set -e
 
-docker build -t atendai/evolution-manager-v2:${VERSION} .
-docker push atendai/evolution-manager-v2:${VERSION}
+VERSION=${1:?Usage: $0 <version>}
+IMAGE="evolutionfoundation/evolution-manager-v2"
+
+docker buildx build \
+  --platform linux/amd64,linux/arm64 \
+  --tag "${IMAGE}:${VERSION}" \
+  --tag "${IMAGE}:latest" \
+  --push \
+  .