mirror of
				https://github.com/advplyr/audiobookshelf.git
				synced 2025-11-03 19:07:00 -05:00 
			
		
		
		
	Merge pull request #1706 from ajaxbits/master
Update:Fix filename issue in tone, bump to v0.1.5
This commit is contained in:
		
						commit
						39e710deb1
					
				@ -12,4 +12,4 @@ RUN apt-get update && \
 | 
			
		||||
  rm -rf /var/lib/apt/lists/*
 | 
			
		||||
 | 
			
		||||
# Move tone executable to appropriate directory
 | 
			
		||||
COPY --from=sandreas/tone:v0.1.2 /usr/local/bin/tone /usr/local/bin/
 | 
			
		||||
COPY --from=sandreas/tone:v0.1.5 /usr/local/bin/tone /usr/local/bin/
 | 
			
		||||
 | 
			
		||||
@ -6,7 +6,7 @@ RUN npm ci && npm cache clean --force
 | 
			
		||||
RUN npm run generate
 | 
			
		||||
 | 
			
		||||
### STAGE 1: Build server ###
 | 
			
		||||
FROM sandreas/tone:v0.1.2 AS tone
 | 
			
		||||
FROM sandreas/tone:v0.1.5 AS tone
 | 
			
		||||
FROM node:16-alpine
 | 
			
		||||
 | 
			
		||||
ENV NODE_ENV=production
 | 
			
		||||
 | 
			
		||||
@ -50,7 +50,7 @@ install_ffmpeg() {
 | 
			
		||||
  echo "Starting FFMPEG Install"
 | 
			
		||||
 | 
			
		||||
  WGET="wget https://johnvansickle.com/ffmpeg/builds/ffmpeg-git-amd64-static.tar.xz --output-document=ffmpeg-git-amd64-static.tar.xz"
 | 
			
		||||
  WGET_TONE="wget https://github.com/sandreas/tone/releases/download/v0.1.2/tone-0.1.2-linux-x64.tar.gz --output-document=tone-0.1.2-linux-x64.tar.gz"
 | 
			
		||||
  WGET_TONE="wget https://github.com/sandreas/tone/releases/download/v0.1.5/tone-0.1.5-linux-x64.tar.gz --output-document=tone-0.1.5-linux-x64.tar.gz"
 | 
			
		||||
 | 
			
		||||
  if ! cd "$FFMPEG_INSTALL_DIR"; then
 | 
			
		||||
    echo "Creating ffmpeg install dir at $FFMPEG_INSTALL_DIR"
 | 
			
		||||
@ -66,8 +66,8 @@ install_ffmpeg() {
 | 
			
		||||
  # Temp downloading tone library to the ffmpeg dir
 | 
			
		||||
  echo "Getting tone.."
 | 
			
		||||
  $WGET_TONE
 | 
			
		||||
  tar xvf tone-0.1.2-linux-x64.tar.gz --strip-components=1
 | 
			
		||||
  rm tone-0.1.2-linux-x64.tar.gz
 | 
			
		||||
  tar xvf tone-0.1.5-linux-x64.tar.gz --strip-components=1
 | 
			
		||||
  rm tone-0.1.5-linux-x64.tar.gz
 | 
			
		||||
 | 
			
		||||
  echo "Good to go on Ffmpeg (& tone)... hopefully"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user