mirror of
				https://github.com/immich-app/immich.git
				synced 2025-11-03 19:17:11 -05:00 
			
		
		
		
	docker: use default entrypoint and command where applicable (#2529)
A default entrypoint and command make it just a bit easier to use the images as there is no longer a need for an explicit entrypoint. The exception is the server image, which still requires the shell script to be specified.
This commit is contained in:
		
							parent
							
								
									ecc894ac82
								
							
						
					
					
						commit
						11a5a990d0
					
				@ -4,7 +4,7 @@ services:
 | 
				
			|||||||
  immich-server:
 | 
					  immich-server:
 | 
				
			||||||
    container_name: immich_server
 | 
					    container_name: immich_server
 | 
				
			||||||
    image: ghcr.io/immich-app/immich-server:release
 | 
					    image: ghcr.io/immich-app/immich-server:release
 | 
				
			||||||
    entrypoint: ["/bin/sh", "./start-server.sh"]
 | 
					    command: ["start-server.sh"]
 | 
				
			||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
      - ${UPLOAD_LOCATION}:/usr/src/app/upload
 | 
					      - ${UPLOAD_LOCATION}:/usr/src/app/upload
 | 
				
			||||||
    env_file:
 | 
					    env_file:
 | 
				
			||||||
@ -18,7 +18,7 @@ services:
 | 
				
			|||||||
  immich-microservices:
 | 
					  immich-microservices:
 | 
				
			||||||
    container_name: immich_microservices
 | 
					    container_name: immich_microservices
 | 
				
			||||||
    image: ghcr.io/immich-app/immich-server:release
 | 
					    image: ghcr.io/immich-app/immich-server:release
 | 
				
			||||||
    entrypoint: ["/bin/sh", "./start-microservices.sh"]
 | 
					    command: ["start-microservices.sh"]
 | 
				
			||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
      - ${UPLOAD_LOCATION}:/usr/src/app/upload
 | 
					      - ${UPLOAD_LOCATION}:/usr/src/app/upload
 | 
				
			||||||
    env_file:
 | 
					    env_file:
 | 
				
			||||||
@ -42,7 +42,6 @@ services:
 | 
				
			|||||||
  immich-web:
 | 
					  immich-web:
 | 
				
			||||||
    container_name: immich_web
 | 
					    container_name: immich_web
 | 
				
			||||||
    image: ghcr.io/immich-app/immich-web:release
 | 
					    image: ghcr.io/immich-app/immich-web:release
 | 
				
			||||||
    entrypoint: ["/bin/sh", "./entrypoint.sh"]
 | 
					 | 
				
			||||||
    env_file:
 | 
					    env_file:
 | 
				
			||||||
      - .env
 | 
					      - .env
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
 | 
				
			|||||||
@ -39,3 +39,5 @@ RUN npm link && npm cache clean --force
 | 
				
			|||||||
VOLUME /usr/src/app/upload
 | 
					VOLUME /usr/src/app/upload
 | 
				
			||||||
 | 
					
 | 
				
			||||||
EXPOSE 3001
 | 
					EXPOSE 3001
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ENTRYPOINT ["/bin/sh"]
 | 
				
			||||||
 | 
				
			|||||||
@ -38,3 +38,7 @@ COPY --from=prod /usr/src/app/build ./build
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
COPY package.json package-lock.json ./
 | 
					COPY package.json package-lock.json ./
 | 
				
			||||||
COPY entrypoint.sh ./
 | 
					COPY entrypoint.sh ./
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ENTRYPOINT ["/bin/sh"]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					CMD ["entrypoint.sh"]
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user