update to ubunto 20.04
This commit is contained in:
		
							parent
							
								
									dae10b8770
								
							
						
					
					
						commit
						c3354a0fc4
					
				
					 1 changed files with 10 additions and 8 deletions
				
			
		
							
								
								
									
										18
									
								
								Dockerfile
									
										
									
									
									
								
							
							
						
						
									
										18
									
								
								Dockerfile
									
										
									
									
									
								
							| 
						 | 
					@ -1,22 +1,21 @@
 | 
				
			||||||
FROM ubuntu:18.04
 | 
					FROM ubuntu:20.04
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ARG DEBIAN_FRONTEND=noninteractive
 | 
					ARG DEBIAN_FRONTEND=noninteractive
 | 
				
			||||||
ENV TZ=America/New_York
 | 
					ENV TZ=America/New_York
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN apt-get update && apt-get install -y \
 | 
					RUN apt-get update && apt-get install -y \
 | 
				
			||||||
    cmake \
 | 
					    cmake \
 | 
				
			||||||
 | 
					    libjpeg8-dev \
 | 
				
			||||||
    g++ \
 | 
					    g++ \
 | 
				
			||||||
    wget \
 | 
					    wget \
 | 
				
			||||||
    unzip \
 | 
					    unzip \
 | 
				
			||||||
    psmisc \
 | 
					 | 
				
			||||||
    git \
 | 
					    git \
 | 
				
			||||||
 | 
					    python2 \
 | 
				
			||||||
 | 
					    virtualenv \
 | 
				
			||||||
 | 
					    python3-dev \
 | 
				
			||||||
    python3-virtualenv \
 | 
					    python3-virtualenv \
 | 
				
			||||||
    libffi-dev \
 | 
					    tzdata
 | 
				
			||||||
    build-essential \
 | 
					    
 | 
				
			||||||
    tzdata \
 | 
					 | 
				
			||||||
    zlib1g-dev \
 | 
					 | 
				
			||||||
    libjpeg-dev
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
EXPOSE 5000
 | 
					EXPOSE 5000
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ARG tag=master
 | 
					ARG tag=master
 | 
				
			||||||
| 
						 | 
					@ -72,6 +71,9 @@ USER octoprint
 | 
				
			||||||
 | 
					
 | 
				
			||||||
WORKDIR /home/octoprint
 | 
					WORKDIR /home/octoprint
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Update the install script for Ubuntu 20
 | 
				
			||||||
 | 
					RUN sed -i 's/python-virtualenv //' ./klipper/scripts/install-ubuntu-18.04.sh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN git clone https://github.com/KevinOConnor/klipper
 | 
					RUN git clone https://github.com/KevinOConnor/klipper
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN ./klipper/scripts/install-ubuntu-18.04.sh
 | 
					RUN ./klipper/scripts/install-ubuntu-18.04.sh
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue