Update dockerfiles

Author: anbsky

Makefile

@@ -17,9 +17,14 @@ transcoder: $(BUILD_DIR)/$(GOOS)_$(GOARCH)/transcoder
 
 conductor_image:
 	docker buildx build -f docker/Dockerfile-conductor -t odyseeteam/transcoder-conductor:$(TRANSCODER_VERSION) --platform linux/amd64 .
+	docker tag odyseeteam/transcoder-conductor:$(TRANSCODER_VERSION) odyseeteam/transcoder-conductor:latest
 
 cworker_image:
 	docker buildx build -f docker/Dockerfile-cworker -t odyseeteam/transcoder-cworker:$(TRANSCODER_VERSION) --platform linux/amd64 .
+	docker tag odyseeteam/transcoder-cworker:$(TRANSCODER_VERSION) odyseeteam/transcoder-cworker:latest
+
+ffmpeg_image:
+	docker buildx build -f docker/Dockerfile-ffmpeg -t odyseeteam/transcoder-ffmpeg:7.0 --platform linux/amd64 .
 
 test_down:
 	docker-compose down

docker/Dockerfile-conductor

@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM alpine:3
 EXPOSE 8080
 
 RUN apk add --no-cache libc6-compat

docker/Dockerfile-cworker

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM odyseeteam/transcoder-ffmpeg:6.1 AS ffmpeg
+FROM odyseeteam/transcoder-ffmpeg:7.0 AS ffmpeg
 FROM odyseeteam/transcoder-gensprite:22.10.0 AS spritegen
 FROM odyseeteam/transcoder-gensprite:22.10.0
 

docker/Dockerfile-ffmpeg

@@ -1,10 +1,10 @@
 # syntax=docker/dockerfile:1
 
-FROM alpine:3.19
+FROM alpine:3
 
 WORKDIR /build
 
-ADD https://www.johnvansickle.com/ffmpeg/releases/ffmpeg-6.1-amd64-static.tar.xz ./
-RUN tar -xf ffmpeg-6.1-amd64-static.tar.xz && mv ffmpeg-*-static/ffprobe ffmpeg-*-static/ffmpeg ./
+ADD https://www.johnvansickle.com/ffmpeg/releases/ffmpeg-7.0-amd64-static.tar.xz ./
+RUN tar -xf ffmpeg-7.0-amd64-static.tar.xz && mv ffmpeg-*-static/ffprobe ffmpeg-*-static/ffmpeg ./
 
 RUN chmod a+x ffmpeg ffprobe

readme.md

@@ -15,12 +15,25 @@ To build the x86 Linux binary, which is used both for `conductor` (controller pa
 make transcoder
 ```
 
-#### Building docker images
+#### Docker images
 
 ```
 make conductor_image cworker_image
 ```
 
+This will build and tag images with a version tag, as well as the `latest`. To push latest images:
+
+```
+docker push odyseeteam/transcoder-conductor:latest
+docker push odyseeteam/transcoder-cworker:latest
+```
+
+`cworker` image is using ffmpeg image as a base. To update or rebuild it, see [its dockerfile](./docker/Dockerfile-ffmpeg) and run:
+
+```
+make ffmpeg_image
+```
+
 ## Versioning
 
 This project is using [SemVer](https://semver.org) YY.MM.MINOR[.MICRO] for `client` package and [CalVer](https://calver.org) YY.MM.MINOR for `transcoder` releases since February 2024: