Skip to content

Commit

Permalink
chore: remove cef dockerimage
Browse files Browse the repository at this point in the history
  • Loading branch information
Julusian committed Nov 20, 2023
1 parent df7b18e commit 7d07a3e
Show file tree
Hide file tree
Showing 9 changed files with 2 additions and 102 deletions.
2 changes: 1 addition & 1 deletion BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ _Note: if you ran docker with sudo, CasparCG server will not be able to run with
2. `git clone --single-branch --branch master https://github.com/CasparCG/server casparcg-server-master`
3. `cd casparcg-server-master`
4. Install dependencies, this can be done with `sudo ./tools/linux/install-dependencies`
5. Extract Boost, FFmpeg and CEF from the docker images via `sudo ./tools/linux/extract-deps-from-docker`. Alternatively these can be prepared manually by following the steps laid out in each Dockerfile
5. Extract Boost and FFmpeg from the docker images via `sudo ./tools/linux/extract-deps-from-docker`. Alternatively these can be prepared manually by following the steps laid out in each Dockerfile
6. `mkdir build && cd build`
7. `cmake ../src`
8. `make -j8`
Expand Down
69 changes: 0 additions & 69 deletions src/CMakeModules/FindCEF.cmake

This file was deleted.

3 changes: 0 additions & 3 deletions tools/linux/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
ARG IMAGE_BASE
ARG IMAGE_BOOST
ARG IMAGE_FFMPEG
ARG IMAGE_CEF

FROM ${IMAGE_BOOST} as boost
FROM ${IMAGE_FFMPEG} as ffmpeg
FROM ${IMAGE_CEF} as cef

FROM ${IMAGE_BASE} as build-casparcg
COPY --from=boost /opt/boost /opt/boost
COPY --from=ffmpeg /opt/ffmpeg /opt/ffmpeg
COPY --from=cef /opt/cef /opt/cef

RUN mkdir /source && mkdir /build && mkdir /install

Expand Down
2 changes: 1 addition & 1 deletion tools/linux/build-base-images
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

source $(dirname "$0")/image-versions

docker rmi $IMAGE_BASE $IMAGE_CEF $IMAGE_BOOST $IMAGE_FFMPEG
docker rmi $IMAGE_BASE $IMAGE_BOOST $IMAGE_FFMPEG

$(dirname "$0")/ensure-base-images
1 change: 0 additions & 1 deletion tools/linux/build-in-docker
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ docker build -t casparcg/server \
--build-arg PROC_COUNT \
--build-arg GIT_HASH \
--build-arg IMAGE_BASE \
--build-arg IMAGE_CEF \
--build-arg IMAGE_BOOST \
--build-arg IMAGE_FFMPEG \
-f $PWD/tools/linux/Dockerfile $PWD
Expand Down
17 changes: 0 additions & 17 deletions tools/linux/cef/Dockerfile

This file was deleted.

2 changes: 0 additions & 2 deletions tools/linux/ensure-base-images
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@
source $(dirname "$0")/image-versions

docker pull $IMAGE_BASE || docker build --pull -f tools/linux/base/Dockerfile -t $IMAGE_BASE tools/linux
docker pull $IMAGE_CEF || docker build -t $IMAGE_CEF --build-arg PROC_COUNT --build-arg IMAGE_BASE tools/linux/cef
docker pull $IMAGE_BOOST || docker build -t $IMAGE_BOOST --build-arg PROC_COUNT --build-arg IMAGE_BASE tools/linux/boost
docker pull $IMAGE_FFMPEG || docker build -t $IMAGE_FFMPEG --build-arg PROC_COUNT --build-arg IMAGE_BASE tools/linux/ffmpeg

if [ "$CASPARCG_PUSH_IMAGES" = true ]; then
docker push $IMAGE_BASE
docker push $IMAGE_CEF
docker push $IMAGE_BOOST
docker push $IMAGE_FFMPEG
fi
7 changes: 0 additions & 7 deletions tools/linux/extract-deps-from-docker
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@

source $(dirname "$0")/image-versions

# CEF
echo "Extracting CEF"
rm -Rf /opt/cef
tempContainer=$(docker create $IMAGE_CEF sh)
docker cp $tempContainer:/opt/cef /opt/cef
docker rm -v $tempContainer

# FFmpeg
echo "Extracting FFmpeg"
rm -Rf /opt/ffmpeg
Expand Down
1 change: 0 additions & 1 deletion tools/linux/image-versions
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
export IMAGE_PREFIX=ghcr.io/casparcg/server/

export IMAGE_BASE=${IMAGE_PREFIX}base:jammy-0
export IMAGE_CEF=${IMAGE_PREFIX}cef:95.0.4638.69-obs-2
export IMAGE_BOOST=${IMAGE_PREFIX}boost:1.67-2
export IMAGE_FFMPEG=${IMAGE_PREFIX}ffmpeg:5.1.3-1

0 comments on commit 7d07a3e

Please sign in to comment.