diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index d2ad631b0..8d50a4640 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -52,8 +52,6 @@ jobs: - run: npm ci - name: Run the TypeScript build run: npx tsc - - name: Create server-package.json - run: cat package.json | grep -v electron > server-package.json - uses: docker/setup-buildx-action@v3 - uses: docker/build-push-action@v6 with: @@ -93,9 +91,6 @@ jobs: - name: Run the TypeScript build run: npx tsc - - name: Create server-package.json - run: cat package.json | grep -v electron > server-package.json - - 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 0c1be531a..d8331184f 100644 --- a/.github/workflows/main-docker.yml +++ b/.github/workflows/main-docker.yml @@ -57,9 +57,6 @@ jobs: - name: Run the TypeScript build run: npx tsc - - name: Create server-package.json - run: cat package.json | grep -v electron > server-package.json - - name: Build and export to Docker uses: docker/build-push-action@v6 with: @@ -163,8 +160,6 @@ jobs: - run: npm ci - name: Run the TypeScript build run: npx tsc - - name: Create server-package.json - run: cat package.json | grep -v electron > server-package.json - name: Login to GHCR uses: docker/login-action@v3 diff --git a/Dockerfile b/Dockerfile index cd274a500..6577f2de6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,10 +19,10 @@ WORKDIR /usr/src/app # Copy only necessary files for build COPY . . -COPY server-package.json package.json # Build and cleanup in a single layer -RUN cp -R build/src/* src/. && \ +RUN sed -i "/electron/d" package.json && \ + cp -R build/src/* src/. && \ cp build/docker_healthcheck.js . && \ rm docker_healthcheck.ts && \ npm install && \ diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 36d6f0b7b..2e134ab5e 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -17,10 +17,9 @@ WORKDIR /usr/src/app # Copy only necessary files for build COPY . . -COPY server-package.json package.json # Build and cleanup in a single layer -RUN cp -R build/src/* src/. && \ +RUN sed -i "/electron/d" package.json && \ cp build/docker_healthcheck.js . && \ rm docker_healthcheck.ts && \ npm install && \ diff --git a/bin/build-docker.sh b/bin/build-docker.sh index a765930db..892afcd92 100755 --- a/bin/build-docker.sh +++ b/bin/build-docker.sh @@ -5,8 +5,6 @@ set -e # Fail on any command error VERSION=`jq -r ".version" package.json` SERIES=${VERSION:0:4}-latest -cat package.json | grep -v electron > server-package.json - echo "Compiling typescript..." npx tsc