浏览代码

Update CI Docker image

DarthSim 10 月之前
父节点
当前提交
8bbf22c629
共有 3 个文件被更改,包括 3 次插入19 次删除
  1. 1 17
      .github/ci-docker/Dockerfile
  2. 1 1
      .github/workflows/lint.yml
  3. 1 1
      .github/workflows/test.yml

+ 1 - 17
.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" ]

+ 1 - 1
.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"]

+ 1 - 1
.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"]