Merge pull request #1180 from threefoldtech/development_update_frontend

Cleanup and upgrade for backend & frontend servers

Author: AhmedHanafy725

.github/workflows/production.yml

@@ -3,7 +3,6 @@ name: production
 
 
 
-## DEPLOY TAG FOR WIZARD IS SET MANUAL IN THE HELM FILES  -> TODO
 on:
   push:
     tags:
@@ -13,26 +12,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Login to docker hub
-        run: docker login --username ${{ secrets.DOCKER_USERNAME }} --password ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set config
         run: mv frontend/public/config.prod.js frontend/public/config.js
       - name: Build the Docker image
-        run: docker build . --file Dockerfile --tag jimber/3botlogin:production-${{ github.sha }}
+        run: docker build . --file Dockerfile --tag ghcr.io/${{ github.repository_owner }}/threefold-connect:production-${{ github.sha }}
       - name: Push the Docker image
-        run: docker push jimber/3botlogin:production-${{ github.sha }}
-  # deploy:
-  #   needs: build
-  #   runs-on: whale-replacement
-  #   steps:
-  #     - name: Login to docker hub
-  #       run: docker login --username ${{ secrets.DOCKER_USERNAME }} --password ${{ secrets.DOCKER_TOKEN }}
-  #     - name: kill old docker
-  #       run: docker rm -f 3botlogin || true
-  #     - name: Pull Image
-  #       run: docker pull jimber/3botlogin:production-${{ github.sha }}
-  #     - name: Run new docker
-  #       run: docker run -d -it --restart=unless-stopped --name 3botlogin -v /opt/3botlogin/db/pythonsqlite.db:/usr/share/nginx/backend/pythonsqlite.db -v /opt/3botlogin/config.ini:/usr/share/nginx/backend/config.ini --network=3proxynet jimber/3botlogin:production-${{ github.sha }}
+        run: docker push ghcr.io/${{ github.repository_owner }}/threefold-connect:production-${{ github.sha }}
 
   deploy:
     needs: [build]
@@ -52,4 +43,4 @@ jobs:
       - name: Upgrade production on cluster
         run: |
           echo production-${{ github.sha }}
-          helm upgrade threebotlogin helm_files -f helm_files/valuesProduction.yaml --set images.login.tag=production-${{ github.sha }} -n jimber
+          helm upgrade threebotlogin helm_files -f helm_files/valuesProduction.yaml --set images.login.tag=production-${{ github.sha }} --set images.login.repo=ghcr.io/${{ github.repository_owner }}/threefold-connect -n jimber

.github/workflows/staging.yml

@@ -9,22 +9,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Log into Docker Hub
+      - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.TFDOCKERHUB_USERNAME }}
-          password: ${{ secrets.TFDOCKERHUB_PASSWORD }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set config
         run: mv frontend/public/config.staging.js frontend/public/config.js
       - name: Build the 3botlogin Docker image
-        run: docker build . --file Dockerfile --tag threefolddev/3botlogin:staging-${{ github.sha }}
+        run: docker build . --file Dockerfile --tag ghcr.io/${{ github.repository_owner }}/threefold-connect:staging-${{ github.sha }}
       - name: Push the 3botlogin Docker image
-        run: docker push threefolddev/3botlogin:staging-${{ github.sha }}
-      - name: Build wizard Docker image
-        run: docker build wizard/ --file wizard/Dockerfile --tag threefolddev/wizard:staging-${{ github.sha }}
-      - name: Push wizard Docker image
-        run: docker push threefolddev/wizard:staging-${{ github.sha }}
+        run: docker push ghcr.io/${{ github.repository_owner }}/threefold-connect:staging-${{ github.sha }}
 
   deploy:
     needs: [build]
@@ -37,4 +34,4 @@ jobs:
           echo ${{ secrets.TF_KUBE_CONFIG }} | base64 --decode > ${HOME}/.kube/config
       - name: Install or Upgrade production on cluster
         run: |
-          helm upgrade threebotlogin --install helm_files -f helm_files/valuesStaging.yaml --set images.login.tag=staging-${{ github.sha }} --set images.wizard.tag=staging-${{ github.sha }} -n threefoldconnect-staging
+          helm upgrade threebotlogin --install helm_files -f helm_files/valuesStaging.yaml --set images.login.tag=staging-${{ github.sha }} --set images.login.repo=ghcr.io/${{ github.repository_owner }}/threefold-connect -n threefoldconnect-staging

.gitignore

@@ -275,6 +275,7 @@ frontend/dist
 # local env files
 frontend/.env.local
 frontend/.env.*.local
+frontend/.env
 
 # Log files
 frontend/npm-debug.log*

Dockerfile

@@ -1,48 +1,77 @@
-FROM node:16 AS builder
+FROM node:22 AS frontend-builder
 
 COPY frontend /frontend
 WORKDIR /frontend
 RUN yarn install --frozen-lockfile && yarn build
 
-# COPY example /example
-# WORKDIR /example
-# RUN yarn install --frozen-lockfile && yarn build
-
-COPY wizard /wizard
-WORKDIR /wizard
-RUN yarn install --frozen-lockfile && yarn build
 
+FROM python:3.11-alpine AS backend-builder
 
-FROM nginx:1.25
-COPY backend/requirements.txt requirements.txt
+ENV PYTHONUNBUFFERED=1 \
+    PYTHONDONTWRITEBYTECODE=1 \
+    PIP_NO_CACHE_DIR=1 \
+    PIP_DISABLE_PIP_VERSION_CHECK=1 \
+    POETRY_VERSION=1.8.3 \
+    POETRY_HOME="/opt/poetry" \
+    POETRY_NO_INTERACTION=1 \
+    POETRY_VIRTUALENVS_IN_PROJECT=true \
+    POETRY_VIRTUALENVS_CREATE=true
 
-RUN apt-get update && apt-get install -y \
-    python3 \
-    python3-pip \
+RUN apk add --no-cache \
     gcc \
-    libssl-dev \
-    python3-dev \
+    musl-dev \
     libffi-dev \
-    && rm -rf /var/lib/apt/lists/*
-RUN pip3 install --break-system-packages uwsgi==2.0.26
-RUN pip3 install --break-system-packages --upgrade pip
-# Install stellar-sdk first to get compatible yarl version
-RUN pip3 install --break-system-packages stellar-sdk==9.1.0
-# Increase timeout and retries for slow network connections
-RUN pip3 install --break-system-packages \
-    --default-timeout=100 \
-    --retries=5 \
-    -r requirements.txt --ignore-installed
-
-COPY --from=builder /frontend/dist /var/www/html/frontend
-# COPY --from=builder /example/dist /var/www/html/example
-COPY --from=builder /wizard/dist /var/www/html/wizard
-
-COPY backend/ /usr/share/nginx/backend
+    openssl-dev \
+    python3-dev \
+    linux-headers \
+    curl \
+    make
+
+RUN curl -sSL https://install.python-poetry.org | python3 -
+
+ENV PATH="$POETRY_HOME/bin:$PATH"
+
+WORKDIR /app
+COPY backend/pyproject.toml backend/poetry.lock* ./
+
+RUN poetry install --only main --no-root --no-directory
+
+COPY backend/ ./
+
+RUN poetry install --only main
+
+
+FROM nginx:1.27-alpine AS runtime
+
+RUN apk add --no-cache \
+    libffi \
+    openssl \
+    libgcc \
+    libstdc++ \
+    sqlite-libs
+
+ENV PYTHONUNBUFFERED=1 \
+    PYTHONDONTWRITEBYTECODE=1 \
+    VIRTUAL_ENV=/app/.venv \
+    PATH="/usr/local/bin:/app/.venv/bin:$PATH" \
+    LD_LIBRARY_PATH="/usr/local/lib"
+
+COPY --from=backend-builder /usr/local/bin/python3.11 /usr/local/bin/python3.11
+COPY --from=backend-builder /usr/local/bin/python3 /usr/local/bin/python3
+COPY --from=backend-builder /usr/local/lib/python3.11 /usr/local/lib/python3.11
+COPY --from=backend-builder /usr/local/lib/libpython3.11.so.1.0 /usr/local/lib/libpython3.11.so.1.0
+COPY --from=backend-builder /usr/local/lib/libpython3.so /usr/local/lib/libpython3.so
+
+COPY --from=backend-builder /app/.venv /app/.venv
+COPY --from=backend-builder /app /usr/share/nginx/backend
+COPY --from=frontend-builder /frontend/dist /var/www/html/frontend
 
 COPY nginx.conf /etc/nginx/conf.d/default.conf
 COPY services.sh /services.sh
 RUN chmod +x /services.sh
+
 WORKDIR /usr/share/nginx/backend/
 
+EXPOSE 5000
+
 CMD ["/services.sh"]

backend/README.md

@@ -1,18 +1,45 @@
-# 3botlogin_backend
+# ThreeFold Connect Backend
 
-The (temporary) backend for 3Bot login.
+Modern Python backend for ThreeFold Connect authentication and digital twin management.
 
-## Run service
+## Quick Start
 
-Go inside virtual environment:
+### Prerequisites
 
-`source ./venv/bin/activate`
+- Python 3.11+
+- Poetry (for dependency management)
+- Docker (optional, for containerized deployment)
 
-Start UWSGI backend:
+### Local Development
 
 ```bash
-uwsgi --http :5000 --gevent 1000 --http-websockets --master --wsgi-file __main__.py --callable app -s 0.0.0.0:3030
-: 1643024584:0;uwsgi --http :5000 --gevent 1000 --http-websockets --master --wsgi-file __main__.py --callable app -s 0.0.0.0:3030
+# Install dependencies
+poetry install
+
+# Run the backend
+poetry run python __main__.py
+```
+
+Or activate the virtual environment:
+
+```bash
+poetry shell
+python __main__.py
+```
+
+The backend will start on `http://localhost:5000`
+
+### Docker Development
+
+```bash
+# Build the image
+docker build -t threefold-connect .
+
+# Run the container
+docker run -d -p 5000:5000 \
+  -v $(pwd)/pythonsqlite.db:/usr/share/nginx/backend/pythonsqlite.db \
+  -v $(pwd)/config.ini:/usr/share/nginx/backend/config.ini \
+  threefold-connect
 ```
 
 ## Data to save

backend/__main__.py

@@ -23,7 +23,7 @@
 app.register_blueprint(api_crypt)
 app.register_blueprint(api_payment)
 
-CORS(app, support_credentials=True, resources={r"*": {"origins": ["*"]}})
+CORS(app, supports_credentials=True, resources={r"*": {"origins": ["*"]}})
 
 logging.getLogger("werkzeug").setLevel(level=logging.ERROR)
 logging.getLogger("socketio").setLevel(level=logging.ERROR)