Merge pull request #210 from makeopensource/fix-deployment

Fix CI/CD

Author: RA341

.dockerignore

@@ -1,3 +1,4 @@
 /**/node_modules
 /logs
-/devU-api/src/tango/tests/test_files
+/devU-api/src/tango/tests/test_files
+.env.*

.github/workflows/api.yml

@@ -0,0 +1,50 @@
+# Builds DevU api
+name: Build DevU api
+
+on:
+  push:
+    paths:
+      - 'devU-api/**'
+    branches:
+      - develop # add more branches as needed
+
+jobs:
+  build-api-docker:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write # to be able to publish a GitHub release
+      packages: write # to be able to publish docker image packages
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GHCR registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Convert image name to lowercase
+        run: |
+          original_string=${{ github.repository }}
+          echo "repo_url=$(echo $original_string | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
+
+      - name: Get Branch Name
+        id: get_branch
+        run: echo "::set-output name=branch_name::${GITHUB_REF#refs/heads/}"
+
+      - name: build api docker
+        run: |
+          IMAGE_NAME=ghcr.io/${{ env.repo_url }}/api:${{ steps.get_branch.outputs.branch_name }}
+          echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV
+
+          docker build . -f api.Dockerfile -t $IMAGE_NAME
+          docker push $IMAGE_NAME
+
+      - name: build tango docker
+        run: |
+          IMAGE_NAME=ghcr.io/${{ env.repo_url }}/tango:${{ steps.get_branch.outputs.branch_name }}
+          docker build ./tango -f ./tango/Dockerfile -t $IMAGE_NAME
+          docker push $IMAGE_NAME

.github/workflows/client.yml

@@ -0,0 +1,52 @@
+# Builds DevU client
+name: Build DevU client
+
+on:
+  push:
+    paths:
+      - 'devU-client/**'
+    branches:
+      - develop # add more branches as needed
+
+jobs:
+  build-client-docker:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write # to be able to publish a GitHub release
+      packages: write # to be able to publish packages
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GHCR registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Convert image name to lowercase
+        run: |
+          original_string=${{ github.repository }}
+          echo "repo_url=$(echo $original_string | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
+
+      - name: Get Branch Name
+        id: get_branch
+        run: echo "::set-output name=branch_name::${GITHUB_REF#refs/heads/}"
+
+      - name: build client docker
+        run: |
+          IMAGE_NAME=ghcr.io/${{ env.repo_url }}/client:${{ steps.get_branch.outputs.branch_name }}
+          echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV
+      
+          docker build . -f client.Dockerfile -t $IMAGE_NAME
+          docker push $IMAGE_NAME
+
+      - name: build nginx
+        run: |
+          IMAGE_NAME=ghcr.io/${{ env.repo_url }}/nginx:${{ steps.get_branch.outputs.branch_name }}
+          echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV
+          
+          docker build . -f nginx.Dockerfile -t $IMAGE_NAME          
+          docker push $IMAGE_NAME

.github/workflows/dev.yml

@@ -6,4 +6,5 @@ node_modules/
 /.vscode
 /logs
 /*/node_modules
-/*/package-lock.json
+/*/package-lock.json
+levi

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-FROM node:20 AS module_builder
+FROM node:22-alpine AS module_builder
 
 WORKDIR /tmp
 
@@ -21,7 +21,7 @@ COPY devU-api/config/ ./config
 
 RUN ./generateConfig.sh default.yml
 
-FROM node:20
+FROM node:22-alpine
 
 WORKDIR /app
 
@@ -43,4 +43,3 @@ RUN chmod +x /wait
 
 # TypeORM Migrations
 CMD /wait && npm run typeorm -- migration:run -d src/database.ts && npm start
-

.gitignore

@@ -1,4 +1,4 @@
-FROM node:16 AS module_builder
+FROM node:22-alpine AS module_builder
 
 WORKDIR /tmp
 
@@ -8,7 +8,7 @@ RUN npm install && \
     npm run clean-directory && \
     npm run build-docker
 
-FROM node:16  AS frontend
+FROM node:22-alpine
 
 WORKDIR /app
 
@@ -20,12 +20,5 @@ COPY ./devU-client/ .
 
 COPY --from=module_builder /tmp/devu-shared-modules ./devu-shared-modules
 
-RUN npm run build-local
-
-# final stage serve frontend files
-FROM nginx:1.23.3
-
-COPY nginx.conf /etc/nginx/nginx.conf
-
-# Copy built frontend files to nginx serving directory
-COPY --from=frontend /app/dist/local /usr/share/nginx/html
+# build frontend during run so that we can modify baseurl via docker envoirment
+CMD npm run --silent build-docker && rm -rf /out/* && cp -r /app/dist/* /out

api.Dockerfile

@@ -8,6 +8,7 @@
     "build-development": "cross-env NODE_ENV=development webpack --mode=production",
     "build-all": "concurrently \"npm run build-development\" \"npm run build\"",
     "build-local": "cross-env NODE_ENV=local webpack --mode=production",
+    "build-docker": "SASS_DEPRECATE_IMPORT=no webpack --mode=production --no-stats",
     "format": "prettier --write \"src/**/*.{ts,tsx,json,md}\"",
     "pre-commit": "lint-staged",
     "dev-backend": "docker compose -f ../docker-compose.yml --profile dev-client up -d",
@@ -78,7 +79,7 @@
     "sass-loader": "^10.2.0",
     "style-loader": "^2.0.0",
     "ts-loader": "^8.0.15",
-    "webpack": "^5.91.0",
+    "webpack": "^5.98.0",
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^5.0.4"

client.Dockerfile

@@ -15,11 +15,27 @@ services:
       - '' # so it starts with normal docker compose
       - 'dev-client' # start when developing client
 
-  client-nginx:
-    # Builds the front end and serves the frontend static files using nginx
+  client:
+    # Builds the front end and exports static files to ./dist
     build:
+      context: .
       dockerfile: client.Dockerfile
+    volumes:
+      - ./dist:/out
+    profiles:
+      - '' # so it starts with normal docker compose
+      - 'dev-api' # start when developing api
+
+  nginx:
+    # Hosts the front end static files from ./dist/local thorough a web server
+    build:
       context: .
+      dockerfile: nginx.Dockerfile
+    volumes:
+      - ./dist/local:/usr/share/nginx/html
+    depends_on:
+      client:
+        condition: service_completed_successfully
     ports:
       - '9000:80'
     profiles:
@@ -54,6 +70,16 @@ services:
       MINIO_ROOT_PASSWORD: changeMe
     command: server /data --console-address ":9001"
 
+#  leviathan:
+#    container_name: leviathan
+#    image: ghcr.io/makeopensource/leviathan:dev
+#    ports:
+#      - "9221:9221"
+#    volumes:
+#      - /var/run/docker.sock:/var/run/docker.sock
+#      - ./levi/:/app/appdata
+#    restart: unless-stopped
+
   # tango stuff
   tango:
     container_name: tango