mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-03 20:06:08 +01:00 
			
		
		
		
	build(Docker): move server-package.json preparation into Dockerfile
This commit is contained in:
		
				
					committed by
					
						
						Panagiotis Papadopoulos
					
				
			
			
				
	
			
			
			
						parent
						
							bb7a4f9bc3
						
					
				
				
					commit
					2973d38db0
				
			
							
								
								
									
										5
									
								
								.github/workflows/dev.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.github/workflows/dev.yml
									
									
									
									
										vendored
									
									
								
							@@ -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:
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										5
									
								
								.github/workflows/main-docker.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.github/workflows/main-docker.yml
									
									
									
									
										vendored
									
									
								
							@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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 && \
 | 
			
		||||
 
 | 
			
		||||
@@ -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 && \
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user