From 8bbf22c6290130a1a893049f08b783798497f320 Mon Sep 17 00:00:00 2001 From: DarthSim Date: Thu, 11 Jul 2024 18:48:55 +0300 Subject: [PATCH] Update CI Docker image --- .github/ci-docker/Dockerfile | 18 +----------------- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 2 +- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/.github/ci-docker/Dockerfile b/.github/ci-docker/Dockerfile index 780c1df4..bc8c769d 100644 --- a/.github/ci-docker/Dockerfile +++ b/.github/ci-docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:mantic +FROM ubuntu:noble RUN apt-get -qq update \ && apt-get install -y --no-install-recommends \ @@ -20,14 +20,6 @@ RUN apt-get -qq update \ librsvg2-dev \ libexif-dev \ liblcms2-dev \ - libavcodec-dev \ - libavformat-dev \ - libavutil-dev \ - libswscale-dev \ - libopencv-core-dev \ - libopencv-imgproc-dev \ - libopencv-objdetect-dev \ - libopencv-dnn-dev \ && python3 -m venv /root/.python \ && /root/.python/bin/pip install meson ninja \ && rm -rf /var/lib/apt/lists/* @@ -67,14 +59,6 @@ RUN \ && rm -rf libvips-$VIPS_RELEASE.tar.gz libvips-$VIPS_RELEASE; \ done -RUN echo "Name: OpenCV\n" \ - "Description: Open Source Computer Vision Library\n" \ - "Version: 4.5.1\n" \ - "Libs: -L/usr/lib/x86_64-linux-gnu -lopencv_dnn -lopencv_objdetect -lopencv_imgproc -lopencv_core\n" \ - "Libs.private: -ldl -lm -lpthread -lrt\n" \ - "Cflags: -I/usr/include/opencv4\n" \ - > /usr/lib/x86_64-linux-gnu/pkgconfig/opencv4.pc - WORKDIR /go/src ENTRYPOINT [ "/bin/bash" ] diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 7e1f3242..90af301a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -11,7 +11,7 @@ jobs: lint: runs-on: ubuntu-latest container: - image: darthsim/imgproxy-ci:202404152040 + image: darthsim/imgproxy-ci:202407111824 strategy: matrix: go-version: ["1.22.x"] diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0a28878f..8cbcf1c0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: test: runs-on: ubuntu-latest container: - image: darthsim/imgproxy-ci:202404152040 + image: darthsim/imgproxy-ci:202407111824 strategy: matrix: go-version: ["1.22.x", "1.21.x"]