mirror of
				https://github.com/TheLartians/ModernCppStarter.git
				synced 2025-10-31 02:01:33 +01:00 
			
		
		
		
	Update docker image to use Ubuntu's current LTS and fix ghostscript warning
This commit is contained in:
		
							parent
							
								
									48bb57b6a5
								
							
						
					
					
						commit
						a4cedc75ff
					
				
					 1 changed files with 15 additions and 4 deletions
				
			
		
							
								
								
									
										19
									
								
								Dockerfile
									
										
									
									
									
								
							
							
						
						
									
										19
									
								
								Dockerfile
									
										
									
									
									
								
							|  | @ -1,5 +1,5 @@ | ||||||
| # Use official Ubuntu image | # Use official Ubuntu image | ||||||
| FROM ubuntu:22.04 | FROM ubuntu:24.04 | ||||||
| 
 | 
 | ||||||
| # Install dependencies | # Install dependencies | ||||||
| RUN apt-get update && \ | RUN apt-get update && \ | ||||||
|  | @ -13,7 +13,7 @@ RUN apt-get update && \ | ||||||
|     lldb \ |     lldb \ | ||||||
|     python3 \ |     python3 \ | ||||||
|     python3-pip \ |     python3-pip \ | ||||||
|     python3-jinja2 \ |     python3-venv \ | ||||||
|     clang \ |     clang \ | ||||||
|     clang-tidy \ |     clang-tidy \ | ||||||
|     lcov \ |     lcov \ | ||||||
|  | @ -22,9 +22,20 @@ RUN apt-get update && \ | ||||||
|     libpsl-dev \ |     libpsl-dev \ | ||||||
|     sudo \ |     sudo \ | ||||||
|     pkg-config \ |     pkg-config \ | ||||||
|  |     ghostscript \ | ||||||
|     && apt-get clean |     && apt-get clean | ||||||
| 
 | 
 | ||||||
| RUN pip3 install clang-format==14.0.6 cmake_format==0.6.11 pyyaml | # Create and activate a virtual environment for Python tools | ||||||
|  | ENV VIRTUAL_ENV=/opt/venv | ||||||
|  | RUN python3 -m venv $VIRTUAL_ENV | ||||||
|  | ENV PATH="$VIRTUAL_ENV/bin:$PATH" | ||||||
| 
 | 
 | ||||||
| # Load shell. | # Set CLANG_FORMAT_EXECUTABLE environment variable to use clang-format from the venv | ||||||
|  | RUN ln -s /opt/venv/bin/clang-format /usr/local/bin/clang-format | ||||||
|  | 
 | ||||||
|  | # Upgrade pip and install Python packages in venv | ||||||
|  | RUN pip install --upgrade pip && \ | ||||||
|  |     pip install clang-format==14.0.6 cmake_format==0.6.11 pyyaml jinja2 pygments | ||||||
|  | 
 | ||||||
|  | # Load shell | ||||||
| CMD ["/bin/bash"] | CMD ["/bin/bash"] | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue