mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-04 05:28:59 +01:00 
			
		
		
		
	Fix missing webpack bundle generation in Docker container build
This commit is contained in:
		
							parent
							
								
									0480f391d3
								
							
						
					
					
						commit
						851465da62
					
				
							
								
								
									
										22
									
								
								Dockerfile
									
									
									
									
									
								
							
							
						
						
									
										22
									
								
								Dockerfile
									
									
									
									
									
								
							@ -4,6 +4,9 @@ FROM node:16.18.0-alpine
 | 
			
		||||
# Create app directory
 | 
			
		||||
WORKDIR /usr/src/app
 | 
			
		||||
 | 
			
		||||
# Bundle app source
 | 
			
		||||
COPY . .
 | 
			
		||||
 | 
			
		||||
COPY server-package.json package.json
 | 
			
		||||
 | 
			
		||||
# Install app dependencies
 | 
			
		||||
@ -18,20 +21,19 @@ RUN set -x \
 | 
			
		||||
        nasm \
 | 
			
		||||
        libpng-dev \
 | 
			
		||||
        python3 \
 | 
			
		||||
    && npm install --production \
 | 
			
		||||
    && apk del .build-dependencies
 | 
			
		||||
    && npm install \
 | 
			
		||||
    && apk del .build-dependencies \
 | 
			
		||||
    && npm run webpack \
 | 
			
		||||
    && npm prune --omit=dev \
 | 
			
		||||
# Set the path to the newly created webpack bundle
 | 
			
		||||
    && sed -i -e 's/app\/desktop.js/app-dist\/desktop.js/g' src/views/desktop.ejs \
 | 
			
		||||
    && sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' src/views/mobile.ejs \
 | 
			
		||||
    && sed -i -e 's/app\/setup.js/app-dist\/setup.js/g' src/views/setup.ejs \
 | 
			
		||||
    && sed -i -e 's/app\/share.js/app-dist\/share.js/g' src/views/share/*.ejs
 | 
			
		||||
 | 
			
		||||
# Some setup tools need to be kept
 | 
			
		||||
RUN apk add --no-cache su-exec shadow
 | 
			
		||||
 | 
			
		||||
# Bundle app source
 | 
			
		||||
COPY . .
 | 
			
		||||
 | 
			
		||||
RUN sed -i -e 's/app\/desktop.js/app-dist\/desktop.js/g' src/views/desktop.ejs && \
 | 
			
		||||
    sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' src/views/mobile.ejs && \
 | 
			
		||||
    sed -i -e 's/app\/setup.js/app-dist\/setup.js/g' src/views/setup.ejs && \
 | 
			
		||||
    sed -i -e 's/app\/share.js/app-dist\/share.js/g' src/views/share/*.ejs
 | 
			
		||||
 | 
			
		||||
# Add application user and setup proper volume permissions
 | 
			
		||||
RUN adduser -s /bin/false node; exit 0
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user