update docker to 22, and use python3 by default
This commit is contained in:
		
							parent
							
								
									f56788465d
								
							
						
					
					
						commit
						c9f23c11b3
					
				@ -1,4 +1,4 @@
 | 
				
			|||||||
FROM ubuntu:20.04
 | 
					FROM ubuntu:22.04
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ARG DEBIAN_FRONTEND=noninteractive
 | 
					ARG DEBIAN_FRONTEND=noninteractive
 | 
				
			||||||
RUN apt-get update -qq \
 | 
					RUN apt-get update -qq \
 | 
				
			||||||
@ -11,6 +11,7 @@ RUN apt-get update -qq \
 | 
				
			|||||||
      make \
 | 
					      make \
 | 
				
			||||||
      python3 \
 | 
					      python3 \
 | 
				
			||||||
      python3-pip \
 | 
					      python3-pip \
 | 
				
			||||||
 | 
					      python-is-python3 \
 | 
				
			||||||
      tar \
 | 
					      tar \
 | 
				
			||||||
      unzip \
 | 
					      unzip \
 | 
				
			||||||
      wget \
 | 
					      wget \
 | 
				
			||||||
@ -19,7 +20,6 @@ RUN apt-get update -qq \
 | 
				
			|||||||
      libffi-dev \
 | 
					      libffi-dev \
 | 
				
			||||||
      libssl-dev \
 | 
					      libssl-dev \
 | 
				
			||||||
      python3-dev \
 | 
					      python3-dev \
 | 
				
			||||||
      python \
 | 
					 | 
				
			||||||
      git \
 | 
					      git \
 | 
				
			||||||
      apt-utils \
 | 
					      apt-utils \
 | 
				
			||||||
    && curl -sL https://deb.nodesource.com/setup_18.x | bash - \
 | 
					    && curl -sL https://deb.nodesource.com/setup_18.x | bash - \
 | 
				
			||||||
@ -30,6 +30,7 @@ RUN apt-get update -qq \
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
RUN pip3 install adafruit-nrfutil
 | 
					RUN pip3 install adafruit-nrfutil
 | 
				
			||||||
RUN pip3 install -Iv cryptography==3.3
 | 
					RUN pip3 install -Iv cryptography==3.3
 | 
				
			||||||
 | 
					RUN pip3 install cbor
 | 
				
			||||||
RUN npm i lv_font_conv@1.5.2 -g
 | 
					RUN npm i lv_font_conv@1.5.2 -g
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# build.sh knows how to compile
 | 
					# build.sh knows how to compile
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user