Merge pull request #282 from demml/docker-dev

Docker dev

Author: thorrester

.github/workflows/build-assets.yml

@@ -8,6 +8,7 @@ on:
   push:
     branches:
       - main
+  pull_request:
   release:
     types: [published]
 
@@ -22,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-22.04
+          - os: ubuntu-22.04 #
             target: x86_64-unknown-linux-gnu
             archive: tar.gz
             binary_name: opsml-server
@@ -34,12 +35,6 @@ jobs:
             binary_name: opsml-server
             archive_name: opsml-server-aarch64-linux-gnu
 
-          - os: macos-latest
-            target: aarch64-apple-darwin
-            archive: zip
-            binary_name: opsml-server
-            archive_name: opsml-server-aarch64-darwin
-
           - os: macos-13
             target: x86_64-apple-darwin
             archive: zip
@@ -78,19 +73,23 @@ jobs:
         with:
           python-version: ${{ env.INTERPRETER }}
 
-      - name: Install UI dependencies
-        run: |
-          make install.ui.deps
-          make build.ui
-
       - name: Update apt repositories (Linux)
         if: contains(matrix.os, 'ubuntu')
         run: |
           sudo apt-get update -y
           sudo apt-get install -y build-essential
 
+      - name: Install UI dependencies
+        run: |
+          # install all deps and build UI
+          make build.ui
+
+          # remove node_modules and rebuild prod version to reduce size
+          make install.ui.deps.prod
+
       - name: Build Binaries
-        run: cargo build -p opsml-server --release --target ${{ matrix.target }}
+        run: |
+          cargo build -p opsml-server --release --target ${{ matrix.target }}
 
       - name: Prepare binary directory
         shell: bash
@@ -102,6 +101,12 @@ jobs:
             cp target/${{ matrix.target }}/release/${{ matrix.binary_name }} release-bin/
             chmod +x release-bin/${{ matrix.binary_name }}
           fi
+          # Copy UI build for Docker builds
+          if [ "${{ matrix.target }}" == "x86_64-unknown-linux-gnu" ] || [ "${{ matrix.target }}" == "aarch64-unknown-linux-gnu" ]; then
+            mkdir -p release-bin/ui
+            cp -r crates/opsml_server/opsml_ui/build release-bin/ui/build || true
+            cp -r crates/opsml_server/opsml_ui/node_modules release-bin/ui/node_modules || true
+          fi
 
       - name: Create zip archive (Windows/macOS)
         if: contains(matrix.archive, 'zip')
@@ -128,6 +133,28 @@ jobs:
           path: ${{ matrix.archive_name }}.${{ matrix.archive }}
           retention-days: 1
 
+      - name: Package UI for Node.js distribution
+        if: matrix.target == 'x86_64-unknown-linux-gnu'
+        shell: bash
+        run: |
+          mkdir -p packaged-ui
+          cp -r crates/opsml_server/opsml_ui/build packaged-ui/build
+          cp -r crates/opsml_server/opsml_ui/node_modules packaged-ui/node_modules
+          cp crates/opsml_server/opsml_ui/package.json packaged-ui/
+          cp crates/opsml_server/opsml_ui/pnpm-lock.yaml packaged-ui/ || true
+          cd packaged-ui
+          zip -r ../opsml-ui-node.zip ./*
+
+      # only want to run this once, so only on the first matrix item
+      # The artifact will be the same on all builds regardless of target
+      - name: Upload UI Node.js package artifact
+        if: matrix.target == 'x86_64-unknown-linux-gnu'
+        uses: actions/upload-artifact@v4
+        with:
+          name: opsml-ui-node
+          path: opsml-ui-node.zip
+          retention-days: 1
+
   publish-docker-images:
     if: github.event_name == 'release'
     needs: build
@@ -140,14 +167,13 @@ jobs:
         include:
           - image: "ubuntu"
             tag_suffix: "ubuntu"
-          - image: "alpine"
-            tag_suffix: "alpine"
-          - image: "scratch"
-            tag_suffix: "scratch"
+            artifact: "opsml-server-x86_64-linux-gnu"
           - image: "debian"
             tag_suffix: "debian"
-          - image: "distroless"
-            tag_suffix: "distroless"
+            artifact: "opsml-server-x86_64-linux-gnu"
+          - image: "rocky"
+            tag_suffix: "rocky-minimal"
+            artifact: "opsml-server-x86_64-linux-gnu"
 
     steps:
       - name: Checkout Code
@@ -164,12 +190,15 @@ jobs:
 
       - name: Extract binary
         run: |
-          mkdir -p binary
-          tar -xzf ./artifacts/opsml-server-x86_64-linux-gnu.tar.gz -C ./binary
-
-      - name: Set up binary permissions
-        run: |
-          chmod +x ./binary/opsml-server
+          archive="./artifacts/${{ matrix.artifact }}.tar.gz"
+          if [ -f "$archive" ]; then
+            mkdir -p binary
+            tar -xzf "$archive" -C ./binary
+            chmod +x ./binary/opsml-server
+          else
+            echo "x86_64 binary $archive not found, skipping this build"
+            exit 1
+          fi
 
       - name: Set version tag
         id: set-version
@@ -193,7 +222,7 @@ jobs:
           file: docker/official/${{ matrix.image }}/Dockerfile
           push: true
           build-args: |
-            OPSML_SERVER_BINARY=./binary/opsml-server
+            OPSML_SERVER_BINARY=./binary
           tags: |
             demml/opsml:${{ matrix.tag_suffix }}-amd64-${{ steps.set-version.outputs.VERSION }}
             ${{ github.event_name == 'release' && format('demml/opsml:{0}-amd64-latest', matrix.tag_suffix) || '' }}
@@ -212,14 +241,13 @@ jobs:
         include:
           - image: "ubuntu"
             tag_suffix: "ubuntu"
-          - image: "alpine"
-            tag_suffix: "alpine"
-          - image: "scratch"
-            tag_suffix: "scratch"
+            artifact: "opsml-server-aarch64-linux-gnu"
           - image: "debian"
             tag_suffix: "debian"
-          - image: "distroless"
-            tag_suffix: "distroless"
+            artifact: "opsml-server-aarch64-linux-gnu"
+          - image: "rocky"
+            tag_suffix: "rocky-minimal"
+            artifact: "opsml-server-aarch64-linux-gnu"
 
     steps:
       - name: Checkout Code
@@ -239,15 +267,15 @@ jobs:
 
       - name: Extract binary
         run: |
-          if [ -f "./artifacts/opsml-server-aarch64-linux-gnu.tar.gz" ]; then
+          archive="./artifacts/${{ matrix.artifact }}.tar.gz"
+          if [ -f "$archive" ]; then
             mkdir -p binary
-            tar -xzf ./artifacts/opsml-server-aarch64-linux-gnu.tar.gz -C ./binary
+            tar -xzf "$archive" -C ./binary
             chmod +x ./binary/opsml-server
           else
-            echo "ARM64 binary not found, skipping this build"
+            echo "ARM64 binary $archive not found, skipping this build"
             exit 1
           fi
-        continue-on-error: true
 
       - name: Set version tag
         id: set-version
@@ -272,7 +300,7 @@ jobs:
           push: true
           platforms: linux/arm64
           build-args: |
-            OPSML_SERVER_BINARY=./binary/opsml-server
+            OPSML_SERVER_BINARY=./binary
           tags: |
             demml/opsml:${{ matrix.tag_suffix }}-arm64-${{ steps.set-version.outputs.VERSION }}
             ${{ github.event_name == 'release' && format('demml/opsml:{0}-arm64-latest', matrix.tag_suffix) || '' }}

Cargo.lock

@@ -89,7 +89,6 @@ rand = { version = "0.9.1"}
 rayon = "1.*"
 regex = "1.*"
 reqwest = { version = "0.12.*", features = ["json", "stream", "multipart", "rustls-tls", "rustls-tls-native-roots", "blocking" ], default-features = false }
-rust-embed = "8.*"
 reqwest-middleware = "0.*"
 rusty-logging = "0.*"
 # we cant use crates.io because scouter relies on a fork of linfa at the moment

Cargo.toml

@@ -121,11 +121,17 @@ ui.update.deps:
 install.ui.deps:
 	cd $(UI_DIR) && pnpm install
 
-.PHONY: ui.build
+.PHONY: ui.install.deps.prod
+install.ui.deps.prod:
+	# remove existing node_modules
+	rm -rf $(UI_DIR)/node_modules
+	# install only production dependencies
+	cd $(UI_DIR) && pnpm install --prod
+
+.PHONY: build.ui
 build.ui:
 	cd $(UI_DIR) && pnpm install
 	cd $(UI_DIR) && pnpm build
-	touch $(UI_DIR)/site/.gitkeep # to make sure the site folder is not ignored by git
 
 ui.dev:
 	cd $(UI_DIR) && pnpm run dev
@@ -154,7 +160,7 @@ dev.frontend:
 
 .PHONY: build.backend
 build.backend:
-	cargo build --release -p opsml-server
+	cargo build -p opsml-server --target
 
 .PHONY: start.backend
 start.backend: build.backend
@@ -176,9 +182,9 @@ start.both:
 	@echo "Starting both servers in production mode..."
 	@echo "Backend API: http://localhost:8080" 
 	@echo "Frontend SSR: http://localhost:3000"
-	@make -j2 start.backend start.frontend
+	@make -j2 dev.backend start.frontend
 
 .PHONY: stop.both
 stop.both:
 	-lsof -ti:3000 | xargs kill -9 2>/dev/null || true
-	-lsof -ti:8080 | xargs kill -9 2>/dev/null || true
+	-lsof -ti:8080 | xargs kill -9 2>/dev/null || true

Makefile

@@ -40,6 +40,8 @@ flate2 = "1.*"
 tar = "*"
 
 
+
+
 [dev-dependencies]
 mockall = { workspace = true }
 mockito = { workspace = true }