From dfebba725a606a5a3a12396e42645dfb6f4eecaa Mon Sep 17 00:00:00 2001
From: Will Ernst <wernst@users.noreply.github.com>
Date: Mon, 17 Jun 2024 10:49:20 -0700
Subject: [PATCH] cleanup docker build process

---
 .github/workflows/publish.yml                            | 2 +-
 packages/node-server/package.json                        | 1 -
 packages/node-server/scripts/build.sh                    | 9 ---------
 .../scripts/docker-check-version-and-publish.js          | 4 +---
 packages/node-server/scripts/publish.sh                  | 6 +++---
 5 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100755 packages/node-server/scripts/build.sh

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 7742f488..2c4e6f88 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -43,7 +43,7 @@ jobs:
     needs: publish-npm
     runs-on: ubuntu-latest
     # TODO: only run if publish was made to @triplit/server
-    # if: needs.publish-npm.outputs.published == 'true'
+    if: needs.publish-npm.outputs.published == 'true'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/packages/node-server/package.json b/packages/node-server/package.json
index 236d226a..4b8fe960 100644
--- a/packages/node-server/package.json
+++ b/packages/node-server/package.json
@@ -6,7 +6,6 @@
   "version": "0.3.49",
   "scripts": {
     "start": "node ./run.js",
-    "build": "./scripts/build.sh",
     "publish": "./scripts/publish.sh",
     "check-and-publish": "node ./scripts/docker-check-version-and-publish.js"
   },
diff --git a/packages/node-server/scripts/build.sh b/packages/node-server/scripts/build.sh
deleted file mode 100755
index 783cb6a7..00000000
--- a/packages/node-server/scripts/build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Extract the version
-VERSION=$(node -p "require('./package.json').version")
-
-# Build and tag the Docker image
-# Specify platforms: https://docs.docker.com/build/building/multi-platform/#building-multi-platform-images
-docker buildx build -t aspencloud/triplit-server:$VERSION -t aspencloud/triplit-server:latest --platform linux/amd64,linux/arm64 --push .
-# docker tag aspencloud/triplit-server:$VERSION aspencloud/triplit-server:latest
\ No newline at end of file
diff --git a/packages/node-server/scripts/docker-check-version-and-publish.js b/packages/node-server/scripts/docker-check-version-and-publish.js
index 476ddeb0..d3a07e04 100644
--- a/packages/node-server/scripts/docker-check-version-and-publish.js
+++ b/packages/node-server/scripts/docker-check-version-and-publish.js
@@ -38,9 +38,7 @@ async function publishIfNewVersion() {
   ) {
     console.log('New version detected. Publishing...');
     // working directory is package root
-    // Will publish too
-    execSync('yarn build', { stdio: 'inherit' });
-    // execSync('yarn publish', { stdio: 'inherit' });
+    execSync('yarn publish', { stdio: 'inherit' });
     await recordImagePublish({
       server_version: currentVersion,
       db_version: dbPackageJson.version,
diff --git a/packages/node-server/scripts/publish.sh b/packages/node-server/scripts/publish.sh
index 71b74681..9da4174a 100755
--- a/packages/node-server/scripts/publish.sh
+++ b/packages/node-server/scripts/publish.sh
@@ -3,6 +3,6 @@
 # Extract the version
 VERSION=$(node -p "require('./package.json').version")
 
-# Push the tags to Docker Hub
-docker push aspencloud/triplit-server:$VERSION
-docker push aspencloud/triplit-server:latest
\ No newline at end of file
+# Build and tag the Docker image
+# Specify platforms: https://docs.docker.com/build/building/multi-platform/#building-multi-platform-images
+docker buildx build -t aspencloud/triplit-server:$VERSION -t aspencloud/triplit-server:latest --platform linux/amd64,linux/arm64 --push .