mirror of
				https://github.com/immich-app/immich.git
				synced 2025-11-04 03:27:09 -05:00 
			
		
		
		
	breaking(setup): use non-root image for immich-proxy (#651)
* feat(nginx): use non-root container for immich-proxy Signed-off-by: PixelJonas <5434875+PixelJonas@users.noreply.github.com> * re-add test env * feat(nginx): add correct port for staging * add the new port to the default docker-compose.yml Signed-off-by: PixelJonas <5434875+PixelJonas@users.noreply.github.com>
This commit is contained in:
		
							parent
							
								
									ccf792f9d3
								
							
						
					
					
						commit
						1a6c16d8ea
					
				@ -102,8 +102,7 @@ services:
 | 
			
		||||
      context: ../nginx
 | 
			
		||||
      dockerfile: Dockerfile
 | 
			
		||||
    ports:
 | 
			
		||||
      - 2283:80
 | 
			
		||||
      - 2284:443
 | 
			
		||||
      - 2283:8080
 | 
			
		||||
    logging:
 | 
			
		||||
      driver: none
 | 
			
		||||
    depends_on:
 | 
			
		||||
 | 
			
		||||
@ -72,8 +72,7 @@ services:
 | 
			
		||||
    container_name: immich_proxy
 | 
			
		||||
    image: altran1502/immich-proxy:staging
 | 
			
		||||
    ports:
 | 
			
		||||
      - 2283:80
 | 
			
		||||
      - 2284:443
 | 
			
		||||
      - 2283:8080
 | 
			
		||||
    logging:
 | 
			
		||||
      driver: none
 | 
			
		||||
    depends_on:
 | 
			
		||||
 | 
			
		||||
@ -74,7 +74,7 @@ services:
 | 
			
		||||
    container_name: immich_proxy
 | 
			
		||||
    image: altran1502/immich-proxy:release
 | 
			
		||||
    ports:
 | 
			
		||||
      - 2283:80
 | 
			
		||||
      - 2283:8080
 | 
			
		||||
    logging:
 | 
			
		||||
      driver: none
 | 
			
		||||
    depends_on:
 | 
			
		||||
 | 
			
		||||
@ -1,6 +1,5 @@
 | 
			
		||||
FROM nginx:latest
 | 
			
		||||
FROM registry.access.redhat.com/ubi9/nginx-120:latest
 | 
			
		||||
 | 
			
		||||
COPY nginx.conf /etc/nginx/conf.d/default.conf
 | 
			
		||||
COPY nginx.conf "${NGINX_CONF_PATH}"
 | 
			
		||||
 | 
			
		||||
EXPOSE 80
 | 
			
		||||
EXPOSE 443
 | 
			
		||||
CMD nginx -g "daemon off;"
 | 
			
		||||
@ -1,14 +1,27 @@
 | 
			
		||||
 | 
			
		||||
map $http_upgrade $connection_upgrade {
 | 
			
		||||
  default upgrade;
 | 
			
		||||
  '' close;
 | 
			
		||||
 | 
			
		||||
worker_processes auto;
 | 
			
		||||
error_log /var/log/nginx/error.log;
 | 
			
		||||
pid /run/nginx.pid;
 | 
			
		||||
 | 
			
		||||
# Load dynamic modules. See /usr/share/doc/nginx/README.dynamic.
 | 
			
		||||
include /usr/share/nginx/modules/*.conf;
 | 
			
		||||
 | 
			
		||||
events {
 | 
			
		||||
    worker_connections 1024;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
# events {
 | 
			
		||||
#   worker_connections 1000;
 | 
			
		||||
# }
 | 
			
		||||
http {
 | 
			
		||||
  map $http_upgrade $connection_upgrade {
 | 
			
		||||
    default upgrade;
 | 
			
		||||
    '' close;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
server {
 | 
			
		||||
  # events {
 | 
			
		||||
  #   worker_connections 1000;
 | 
			
		||||
  # }
 | 
			
		||||
 | 
			
		||||
  server {
 | 
			
		||||
 | 
			
		||||
    gzip on;
 | 
			
		||||
    gzip_min_length 1000;
 | 
			
		||||
@ -16,7 +29,7 @@ server {
 | 
			
		||||
 | 
			
		||||
    client_max_body_size 50000M;
 | 
			
		||||
 | 
			
		||||
  listen 80;
 | 
			
		||||
    listen 8080;
 | 
			
		||||
    access_log off;
 | 
			
		||||
 | 
			
		||||
    location /api {
 | 
			
		||||
@ -70,4 +83,5 @@ server {
 | 
			
		||||
 | 
			
		||||
      proxy_pass http://immich-web:3000;
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user