Skip to content

Commit 8fabc80

Browse files
DockerFile cleanup (#187)
* clean up dockerfiles
1 parent cbb1d2b commit 8fabc80

15 files changed

+15
-95
lines changed

.github/workflows/docker_linuxes.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,6 @@ jobs:
2828
- name: Run unit tests (ctest) within the Docker image
2929
run: docker run ctl:latest sh -c "cd ./build && ctest"
3030

31-
Dockerfile_openexr3-repo-root:
32-
33-
runs-on: ubuntu-latest
34-
35-
steps:
36-
- uses: actions/checkout@v4
37-
- name: Build the Docker image
38-
run: docker build --no-cache --rm -f ./Dockerfile_openexr3 -t ctl:latest .
39-
40-
- name: Run unit tests (ctest) within the Docker image
41-
run: docker run ctl:latest sh -c "cd ./build && ctest"
42-
4331
ubuntu-18-04:
4432

4533
runs-on: ubuntu-latest

Dockerfile

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM ubuntu:focal
1+
FROM ubuntu:latest
22

33
RUN apt-get update
44

55
# disable interactive install
6-
ENV DEBIAN_FRONTEND noninteractive
6+
ENV DEBIAN_FRONTEND=noninteractive
77

88
# install developement tools
99
RUN apt-get -y install cmake
@@ -14,18 +14,7 @@ RUN apt-get -y install git
1414
RUN apt-get -y install valgrind
1515

1616
# install CTL dependencies
17-
#RUN apt-get -y install libilmbase-dev
18-
#RUN apt-get -y install libopenexr-dev
19-
RUN apt-get -y install zlib1g-dev
20-
WORKDIR /usr/src/
21-
RUN git clone https://github.com/AcademySoftwareFoundation/openexr.git
22-
WORKDIR /usr/src/openexr
23-
RUN git checkout RB-2.5
24-
WORKDIR /usr/src/openexr/build
25-
RUN cmake ..
26-
RUN make
27-
RUN make install
28-
17+
RUN apt-get -y install libopenexr-dev
2918
RUN apt-get -y install libtiff-dev
3019

3120
# build CTL

Dockerfile_openexr3

Lines changed: 0 additions & 57 deletions
This file was deleted.

docker/Dockerfile_ubuntu_18.04

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ubuntu:18.04
33
RUN apt-get update
44

55
# disable interactive install
6-
ENV DEBIAN_FRONTEND noninteractive
6+
ENV DEBIAN_FRONTEND=noninteractive
77

88
# install development tools
99

docker/Dockerfile_ubuntu_20.04

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ubuntu:20.04
33
RUN apt-get update
44

55
# disable interactive install
6-
ENV DEBIAN_FRONTEND noninteractive
6+
ENV DEBIAN_FRONTEND=noninteractive
77

88
# install developement tools
99
RUN apt-get -y install cmake

docker/Dockerfile_ubuntu_22.04

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ubuntu:22.04
33
RUN apt-get update
44

55
# disable interactive install
6-
ENV DEBIAN_FRONTEND noninteractive
6+
ENV DEBIAN_FRONTEND=noninteractive
77

88
# install developement tools
99
RUN apt-get -y install cmake

docker/Dockerfile_ubuntu_22.04_LTO

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ubuntu:22.04
33
RUN apt-get update
44

55
# disable interactive install
6-
ENV DEBIAN_FRONTEND noninteractive
6+
ENV DEBIAN_FRONTEND=noninteractive
77

88
# install developement tools
99
RUN apt-get -y install cmake

docker/Dockerfile_ubuntu_22.04_acescontainer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ubuntu:22.04
33
RUN apt-get update
44

55
# disable interactive install
6-
ENV DEBIAN_FRONTEND noninteractive
6+
ENV DEBIAN_FRONTEND=noninteractive
77

88
# install developement tools
99
RUN apt-get -y install cmake

docker/Dockerfile_ubuntu_22.04_brew

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ubuntu:22.04
33
RUN apt-get update
44

55
# disable interactive install
6-
ENV DEBIAN_FRONTEND noninteractive
6+
ENV DEBIAN_FRONTEND=noninteractive
77

88
# install tools
99
RUN apt-get -y install curl

docker/Dockerfile_ubuntu_22.04_no_libtiff_valgrind

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ubuntu:22.04
33
RUN apt-get update
44

55
# disable interactive install
6-
ENV DEBIAN_FRONTEND noninteractive
6+
ENV DEBIAN_FRONTEND=noninteractive
77

88
# install developement tools
99
RUN apt-get -y install cmake

0 commit comments

Comments
 (0)