From 3553d64060764f8848c246ff35285971e9cdd788 Mon Sep 17 00:00:00 2001 From: Panagiotis Papadopoulos Date: Wed, 5 Mar 2025 08:03:43 +0100 Subject: [PATCH] build(Docker/ci): get rid of running partial build locally this is now handled fully inside Docker. exception for "test_docker" job in "main-docker" -> it seems that one needs to be there still, since it runs Playwright tests from outside the container --- .github/workflows/dev.yml | 19 ------------------- .github/workflows/main-docker.yml | 10 ---------- bin/build-docker.sh | 3 --- 3 files changed, 32 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 8d50a4640..f5e30323d 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -44,14 +44,6 @@ jobs: - test_dev steps: - uses: actions/checkout@v4 - - name: Set up node & dependencies - uses: actions/setup-node@v4 - with: - node-version: 20 - cache: "npm" - - run: npm ci - - name: Run the TypeScript build - run: npx tsc - uses: docker/setup-buildx-action@v3 - uses: docker/build-push-action@v6 with: @@ -80,17 +72,6 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Set up node & dependencies - uses: actions/setup-node@v4 - with: - node-version: 20 - cache: "npm" - - - run: npm ci - - - name: Run the TypeScript build - run: npx tsc - - name: Build and export to Docker uses: docker/build-push-action@v6 with: diff --git a/.github/workflows/main-docker.yml b/.github/workflows/main-docker.yml index d8331184f..085ae836e 100644 --- a/.github/workflows/main-docker.yml +++ b/.github/workflows/main-docker.yml @@ -151,16 +151,6 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - - name: Set up node & dependencies - uses: actions/setup-node@v4 - with: - node-version: 20 - cache: "npm" - - run: npm ci - - name: Run the TypeScript build - run: npx tsc - - name: Login to GHCR uses: docker/login-action@v3 with: diff --git a/bin/build-docker.sh b/bin/build-docker.sh index 892afcd92..d95c289d4 100755 --- a/bin/build-docker.sh +++ b/bin/build-docker.sh @@ -5,9 +5,6 @@ set -e # Fail on any command error VERSION=`jq -r ".version" package.json` SERIES=${VERSION:0:4}-latest -echo "Compiling typescript..." -npx tsc - sudo docker build -t triliumnext/notes:$VERSION --network host -t triliumnext/notes:$SERIES . if [[ $VERSION != *"beta"* ]]; then