Skip to content

Commit 9c84a99

Browse files
committed
tools/docker: Fix almalinux and rockylinux
1 parent dca273b commit 9c84a99

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

tools/docker/images/almalinux-9.Dockerfile

+3-5
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ FROM almalinux:9 AS env
44
#############
55
## SETUP ##
66
#############
7+
ENV PATH=/usr/local/bin:$PATH
78
RUN dnf -y update \
89
&& dnf -y install git wget openssl-devel cmake \
910
&& dnf -y groupinstall "Development Tools" \
1011
&& dnf clean all \
1112
&& rm -rf /var/cache/dnf
1213
ENTRYPOINT ["/usr/bin/bash", "-c"]
13-
CMD [ "/usr/bin/bash" ]
14+
CMD ["/usr/bin/bash"]
1415

1516
# Install SWIG 4.2.1
1617
RUN dnf -y update \
@@ -41,7 +42,6 @@ RUN dnf -y update \
4142
&& dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel maven \
4243
&& dnf clean all \
4344
&& rm -rf /var/cache/dnf
44-
ENV JAVA_HOME=/usr/lib/jvm/java
4545

4646
# Install Python
4747
RUN dnf -y update \
@@ -51,9 +51,6 @@ RUN dnf -y update \
5151
RUN python3 -m pip install \
5252
absl-py mypy mypy-protobuf pandas
5353

54-
ENV TZ=America/Los_Angeles
55-
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
56-
5754
################
5855
## OR-TOOLS ##
5956
################
@@ -92,6 +89,7 @@ RUN make archive_cpp
9289
# .Net
9390
## build
9491
FROM cpp_build AS dotnet_build
92+
RUN sed -i 's/\(<SignAssembly>\).*\(<\/SignAssembly>\)/\1false\2/' ortools/dotnet/Google.OrTools*.csproj.in
9593
ENV USE_DOTNET_CORE_31=ON
9694
RUN make detect_dotnet \
9795
&& make dotnet JOBS=8

tools/docker/images/rockylinux-9.Dockerfile

+3-5
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ FROM rockylinux:9 AS env
44
#############
55
## SETUP ##
66
#############
7+
ENV PATH=/usr/local/bin:$PATH
78
RUN dnf -y update \
89
&& dnf -y install git wget openssl-devel cmake \
910
&& dnf -y groupinstall "Development Tools" \
1011
&& dnf clean all \
1112
&& rm -rf /var/cache/dnf
1213
ENTRYPOINT ["/usr/bin/bash", "-c"]
13-
CMD [ "/usr/bin/bash" ]
14+
CMD ["/usr/bin/bash"]
1415

1516
# Install SWIG 4.2.1
1617
RUN dnf -y update \
@@ -41,7 +42,6 @@ RUN dnf -y update \
4142
&& dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel maven \
4243
&& dnf clean all \
4344
&& rm -rf /var/cache/dnf
44-
ENV JAVA_HOME=/usr/lib/jvm/java
4545

4646
# Install Python
4747
RUN dnf -y update \
@@ -51,9 +51,6 @@ RUN dnf -y update \
5151
RUN python3 -m pip install \
5252
absl-py mypy mypy-protobuf pandas
5353

54-
ENV TZ=America/Los_Angeles
55-
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
56-
5754
################
5855
## OR-TOOLS ##
5956
################
@@ -92,6 +89,7 @@ RUN make archive_cpp
9289
# .Net
9390
## build
9491
FROM cpp_build AS dotnet_build
92+
RUN sed -i 's/\(<SignAssembly>\).*\(<\/SignAssembly>\)/\1false\2/' ortools/dotnet/Google.OrTools*.csproj.in
9593
ENV USE_DOTNET_CORE_31=ON
9694
RUN make detect_dotnet \
9795
&& make dotnet JOBS=8

0 commit comments

Comments
 (0)