Sync CI and Docker Compose image versions (#24053)
This commit is contained in:
		
							parent
							
								
									a52ccd7ad9
								
							
						
					
					
						commit
						4fa542f3c4
					
				@ -41,7 +41,7 @@ services:
 | 
				
			|||||||
      - internal_network
 | 
					      - internal_network
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  redis:
 | 
					  redis:
 | 
				
			||||||
    image: redis:6-alpine
 | 
					    image: redis:7-alpine
 | 
				
			||||||
    restart: unless-stopped
 | 
					    restart: unless-stopped
 | 
				
			||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
      - redis-data:/data
 | 
					      - redis-data:/data
 | 
				
			||||||
 | 
				
			|||||||
@ -25,7 +25,7 @@ jobs:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    services:
 | 
					    services:
 | 
				
			||||||
      postgres:
 | 
					      postgres:
 | 
				
			||||||
        image: postgres:14.5
 | 
					        image: postgres:14-alpine
 | 
				
			||||||
        env:
 | 
					        env:
 | 
				
			||||||
          POSTGRES_PASSWORD: postgres
 | 
					          POSTGRES_PASSWORD: postgres
 | 
				
			||||||
          POSTGRES_USER: postgres
 | 
					          POSTGRES_USER: postgres
 | 
				
			||||||
@ -38,7 +38,7 @@ jobs:
 | 
				
			|||||||
          - 5432:5432
 | 
					          - 5432:5432
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      redis:
 | 
					      redis:
 | 
				
			||||||
        image: redis:7.0
 | 
					        image: redis:7-alpine
 | 
				
			||||||
        options: >-
 | 
					        options: >-
 | 
				
			||||||
          --health-cmd "redis-cli ping"
 | 
					          --health-cmd "redis-cli ping"
 | 
				
			||||||
          --health-interval 10s
 | 
					          --health-interval 10s
 | 
				
			||||||
 | 
				
			|||||||
@ -25,7 +25,7 @@ jobs:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    services:
 | 
					    services:
 | 
				
			||||||
      postgres:
 | 
					      postgres:
 | 
				
			||||||
        image: postgres:14.5
 | 
					        image: postgres:14-alpine
 | 
				
			||||||
        env:
 | 
					        env:
 | 
				
			||||||
          POSTGRES_PASSWORD: postgres
 | 
					          POSTGRES_PASSWORD: postgres
 | 
				
			||||||
          POSTGRES_USER: postgres
 | 
					          POSTGRES_USER: postgres
 | 
				
			||||||
@ -37,7 +37,7 @@ jobs:
 | 
				
			|||||||
        ports:
 | 
					        ports:
 | 
				
			||||||
          - 5432:5432
 | 
					          - 5432:5432
 | 
				
			||||||
      redis:
 | 
					      redis:
 | 
				
			||||||
        image: redis:7.0
 | 
					        image: redis:7-alpine
 | 
				
			||||||
        options: >-
 | 
					        options: >-
 | 
				
			||||||
          --health-cmd "redis-cli ping"
 | 
					          --health-cmd "redis-cli ping"
 | 
				
			||||||
          --health-interval 10s
 | 
					          --health-interval 10s
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										4
									
								
								.github/workflows/test-ruby.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/test-ruby.yml
									
									
									
									
										vendored
									
									
								
							@ -63,7 +63,7 @@ jobs:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    services:
 | 
					    services:
 | 
				
			||||||
      postgres:
 | 
					      postgres:
 | 
				
			||||||
        image: postgres:14.5
 | 
					        image: postgres:14-alpine
 | 
				
			||||||
        env:
 | 
					        env:
 | 
				
			||||||
          POSTGRES_PASSWORD: postgres
 | 
					          POSTGRES_PASSWORD: postgres
 | 
				
			||||||
          POSTGRES_USER: postgres
 | 
					          POSTGRES_USER: postgres
 | 
				
			||||||
@ -76,7 +76,7 @@ jobs:
 | 
				
			|||||||
          - 5432:5432
 | 
					          - 5432:5432
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      redis:
 | 
					      redis:
 | 
				
			||||||
        image: redis:7.0
 | 
					        image: redis:7-alpine
 | 
				
			||||||
        options: >-
 | 
					        options: >-
 | 
				
			||||||
          --health-cmd "redis-cli ping"
 | 
					          --health-cmd "redis-cli ping"
 | 
				
			||||||
          --health-interval 10s
 | 
					          --health-interval 10s
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user