cleanup docker build process

aspen-cloud · Jun 17, 2024 · dfebba7 · dfebba7
1 parent 5f3045c
commit dfebba7
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 17 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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
+# 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 .