Do not use apk cache and upgrade (#9966)
This commit is contained in:
		
							parent
							
								
									11d1502853
								
							
						
					
					
						commit
						26c1aba658
					
				
					 1 changed files with 3 additions and 4 deletions
				
			
		| 
						 | 
					@ -24,8 +24,7 @@ COPY --from=node /usr/local/lib/node_modules /usr/local/lib/node_modules
 | 
				
			||||||
COPY --from=node /usr/local/bin/npm /usr/local/bin/npm
 | 
					COPY --from=node /usr/local/bin/npm /usr/local/bin/npm
 | 
				
			||||||
COPY --from=node /opt/yarn-* /opt/yarn
 | 
					COPY --from=node /opt/yarn-* /opt/yarn
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN apk -U upgrade \
 | 
					RUN apk add --no-cache -t build-dependencies \
 | 
				
			||||||
 && apk add -t build-dependencies \
 | 
					 | 
				
			||||||
    build-base \
 | 
					    build-base \
 | 
				
			||||||
    icu-dev \
 | 
					    icu-dev \
 | 
				
			||||||
    libidn-dev \
 | 
					    libidn-dev \
 | 
				
			||||||
| 
						 | 
					@ -36,7 +35,7 @@ RUN apk -U upgrade \
 | 
				
			||||||
    postgresql-dev \
 | 
					    postgresql-dev \
 | 
				
			||||||
    protobuf-dev \
 | 
					    protobuf-dev \
 | 
				
			||||||
    python \
 | 
					    python \
 | 
				
			||||||
 && apk add \
 | 
					 && apk add --no-cache \
 | 
				
			||||||
    ca-certificates \
 | 
					    ca-certificates \
 | 
				
			||||||
    ffmpeg \
 | 
					    ffmpeg \
 | 
				
			||||||
    file \
 | 
					    file \
 | 
				
			||||||
| 
						 | 
					@ -64,7 +63,7 @@ RUN apk -U upgrade \
 | 
				
			||||||
 && make install \
 | 
					 && make install \
 | 
				
			||||||
 && libtool --finish /usr/local/lib \
 | 
					 && libtool --finish /usr/local/lib \
 | 
				
			||||||
 && cd /mastodon \
 | 
					 && cd /mastodon \
 | 
				
			||||||
 && rm -rf /tmp/* /var/cache/apk/*
 | 
					 && rm -rf /tmp/*
 | 
				
			||||||
 | 
					
 | 
				
			||||||
COPY Gemfile Gemfile.lock package.json yarn.lock .yarnclean /mastodon/
 | 
					COPY Gemfile Gemfile.lock package.json yarn.lock .yarnclean /mastodon/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue