From 752617a32b976272b3887b03f10bf8bf3acb8a16 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 28 Jul 2025 19:09:41 -0700 Subject: [PATCH 1/2] clean up docker images --- Dockerfile | 17 +----- Dockerfile_openexr3 | 57 ------------------- docker/Dockerfile_ubuntu_18.04 | 2 +- docker/Dockerfile_ubuntu_20.04 | 2 +- docker/Dockerfile_ubuntu_22.04 | 2 +- docker/Dockerfile_ubuntu_22.04_LTO | 2 +- docker/Dockerfile_ubuntu_22.04_acescontainer | 2 +- docker/Dockerfile_ubuntu_22.04_brew | 2 +- ...ockerfile_ubuntu_22.04_no_libtiff_valgrind | 2 +- .../Dockerfile_ubuntu_22.04_openexr2_shared | 2 +- .../Dockerfile_ubuntu_22.04_openexr2_static | 2 +- docker/Dockerfile_ubuntu_22.04_openexr33 | 2 +- docker/Dockerfile_ubuntu_latest | 2 +- docker/Dockerfile_ubuntu_latest_clang | 2 +- 14 files changed, 15 insertions(+), 83 deletions(-) delete mode 100644 Dockerfile_openexr3 diff --git a/Dockerfile b/Dockerfile index bd9f720b..ec45d751 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM ubuntu:focal +FROM ubuntu:latest RUN apt-get update # disable interactive install -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # install developement tools RUN apt-get -y install cmake @@ -14,18 +14,7 @@ RUN apt-get -y install git RUN apt-get -y install valgrind # install CTL dependencies -#RUN apt-get -y install libilmbase-dev -#RUN apt-get -y install libopenexr-dev -RUN apt-get -y install zlib1g-dev -WORKDIR /usr/src/ -RUN git clone https://github.com/AcademySoftwareFoundation/openexr.git -WORKDIR /usr/src/openexr -RUN git checkout RB-2.5 -WORKDIR /usr/src/openexr/build -RUN cmake .. -RUN make -RUN make install - +RUN apt-get -y install libopenexr-dev RUN apt-get -y install libtiff-dev # build CTL diff --git a/Dockerfile_openexr3 b/Dockerfile_openexr3 deleted file mode 100644 index 73b9df7d..00000000 --- a/Dockerfile_openexr3 +++ /dev/null @@ -1,57 +0,0 @@ -FROM ubuntu:focal - -RUN apt-get update - -# disable interactive install -ENV DEBIAN_FRONTEND noninteractive - -# install developement tools -RUN apt-get -y install cmake -RUN apt-get -y install g++ -RUN apt-get -y install git - -# install developement debugging tools -RUN apt-get -y install valgrind - -# install CTL dependencies -#RUN apt-get -y install libilmbase-dev -#RUN apt-get -y install libopenexr-dev -#RUN apt-get -y install zlib1g-dev - -WORKDIR /usr/src/ -RUN git clone https://github.com/madler/zlib.git -WORKDIR /usr/src/zlib/build -RUN cmake .. -RUN make -RUN make install - -WORKDIR /usr/src/ -RUN git clone https://github.com/AcademySoftwareFoundation/Imath.git -WORKDIR /usr/src/Imath/build -RUN cmake .. -RUN make -RUN make install - -WORKDIR /usr/src/ -RUN git clone https://github.com/AcademySoftwareFoundation/openexr.git -WORKDIR /usr/src/openexr -RUN git checkout RB-3.1 -WORKDIR /usr/src/openexr/build -RUN cmake .. -RUN make -RUN make install - -RUN apt-get -y install libtiff-dev - -# build CTL -WORKDIR /usr/src/CTL -COPY . . -WORKDIR /usr/src/CTL/build -RUN rm -R * || true -RUN cmake .. -RUN make -RUN make install - -# finalize docker environment -WORKDIR /usr/src/CTL - diff --git a/docker/Dockerfile_ubuntu_18.04 b/docker/Dockerfile_ubuntu_18.04 index 6479e6e0..70b6c8e7 100644 --- a/docker/Dockerfile_ubuntu_18.04 +++ b/docker/Dockerfile_ubuntu_18.04 @@ -3,7 +3,7 @@ FROM ubuntu:18.04 RUN apt-get update # disable interactive install -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # install development tools diff --git a/docker/Dockerfile_ubuntu_20.04 b/docker/Dockerfile_ubuntu_20.04 index 8b0f6e47..3a35d1fc 100644 --- a/docker/Dockerfile_ubuntu_20.04 +++ b/docker/Dockerfile_ubuntu_20.04 @@ -3,7 +3,7 @@ FROM ubuntu:20.04 RUN apt-get update # disable interactive install -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # install developement tools RUN apt-get -y install cmake diff --git a/docker/Dockerfile_ubuntu_22.04 b/docker/Dockerfile_ubuntu_22.04 index 3ef1d13d..c2f5d00f 100644 --- a/docker/Dockerfile_ubuntu_22.04 +++ b/docker/Dockerfile_ubuntu_22.04 @@ -3,7 +3,7 @@ FROM ubuntu:22.04 RUN apt-get update # disable interactive install -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # install developement tools RUN apt-get -y install cmake diff --git a/docker/Dockerfile_ubuntu_22.04_LTO b/docker/Dockerfile_ubuntu_22.04_LTO index 9272d984..6674bb72 100644 --- a/docker/Dockerfile_ubuntu_22.04_LTO +++ b/docker/Dockerfile_ubuntu_22.04_LTO @@ -3,7 +3,7 @@ FROM ubuntu:22.04 RUN apt-get update # disable interactive install -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # install developement tools RUN apt-get -y install cmake diff --git a/docker/Dockerfile_ubuntu_22.04_acescontainer b/docker/Dockerfile_ubuntu_22.04_acescontainer index 27249152..e168e61a 100644 --- a/docker/Dockerfile_ubuntu_22.04_acescontainer +++ b/docker/Dockerfile_ubuntu_22.04_acescontainer @@ -3,7 +3,7 @@ FROM ubuntu:22.04 RUN apt-get update # disable interactive install -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # install developement tools RUN apt-get -y install cmake diff --git a/docker/Dockerfile_ubuntu_22.04_brew b/docker/Dockerfile_ubuntu_22.04_brew index 58966041..457967a7 100644 --- a/docker/Dockerfile_ubuntu_22.04_brew +++ b/docker/Dockerfile_ubuntu_22.04_brew @@ -3,7 +3,7 @@ FROM ubuntu:22.04 RUN apt-get update # disable interactive install -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # install tools RUN apt-get -y install curl diff --git a/docker/Dockerfile_ubuntu_22.04_no_libtiff_valgrind b/docker/Dockerfile_ubuntu_22.04_no_libtiff_valgrind index 2f88f972..d8521726 100644 --- a/docker/Dockerfile_ubuntu_22.04_no_libtiff_valgrind +++ b/docker/Dockerfile_ubuntu_22.04_no_libtiff_valgrind @@ -3,7 +3,7 @@ FROM ubuntu:22.04 RUN apt-get update # disable interactive install -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # install developement tools RUN apt-get -y install cmake diff --git a/docker/Dockerfile_ubuntu_22.04_openexr2_shared b/docker/Dockerfile_ubuntu_22.04_openexr2_shared index f053fd8e..a2c1822d 100644 --- a/docker/Dockerfile_ubuntu_22.04_openexr2_shared +++ b/docker/Dockerfile_ubuntu_22.04_openexr2_shared @@ -3,7 +3,7 @@ FROM ubuntu:22.04 RUN apt-get update # disable interactive install -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # install developement tools RUN apt-get -y install cmake diff --git a/docker/Dockerfile_ubuntu_22.04_openexr2_static b/docker/Dockerfile_ubuntu_22.04_openexr2_static index db8af9d5..2ad7d233 100644 --- a/docker/Dockerfile_ubuntu_22.04_openexr2_static +++ b/docker/Dockerfile_ubuntu_22.04_openexr2_static @@ -3,7 +3,7 @@ FROM ubuntu:22.04 RUN apt-get update # disable interactive install -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # install developement tools RUN apt-get -y install cmake diff --git a/docker/Dockerfile_ubuntu_22.04_openexr33 b/docker/Dockerfile_ubuntu_22.04_openexr33 index 74216ae7..44a13f59 100644 --- a/docker/Dockerfile_ubuntu_22.04_openexr33 +++ b/docker/Dockerfile_ubuntu_22.04_openexr33 @@ -3,7 +3,7 @@ FROM ubuntu:22.04 RUN apt-get update # disable interactive install -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # install developement tools RUN apt-get -y install cmake diff --git a/docker/Dockerfile_ubuntu_latest b/docker/Dockerfile_ubuntu_latest index 1028d080..325c524d 100644 --- a/docker/Dockerfile_ubuntu_latest +++ b/docker/Dockerfile_ubuntu_latest @@ -3,7 +3,7 @@ FROM ubuntu:latest RUN apt-get update # disable interactive install -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # install developement tools RUN apt-get -y install cmake diff --git a/docker/Dockerfile_ubuntu_latest_clang b/docker/Dockerfile_ubuntu_latest_clang index 5645c6d9..07dbba4d 100644 --- a/docker/Dockerfile_ubuntu_latest_clang +++ b/docker/Dockerfile_ubuntu_latest_clang @@ -3,7 +3,7 @@ FROM ubuntu:latest RUN apt-get update # disable interactive install -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # install developement tools RUN apt-get -y install cmake From 8786b77618c09368b05d4efae533dd2bcb831531 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 28 Jul 2025 21:43:02 -0700 Subject: [PATCH 2/2] remove old openexr3 docker from CI workflow --- .github/workflows/docker_linuxes.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/docker_linuxes.yml b/.github/workflows/docker_linuxes.yml index d2e88378..aef3834f 100644 --- a/.github/workflows/docker_linuxes.yml +++ b/.github/workflows/docker_linuxes.yml @@ -28,18 +28,6 @@ jobs: - name: Run unit tests (ctest) within the Docker image run: docker run ctl:latest sh -c "cd ./build && ctest" - Dockerfile_openexr3-repo-root: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - name: Build the Docker image - run: docker build --no-cache --rm -f ./Dockerfile_openexr3 -t ctl:latest . - - - name: Run unit tests (ctest) within the Docker image - run: docker run ctl:latest sh -c "cd ./build && ctest" - ubuntu-18-04: runs-on: ubuntu-latest