Skip to content

Commit ed94162

Browse files
committed
tools/release: Fix manylinux image
need maven 3.6+, base image only provide 3.5.3 in the feed...
1 parent 5a3253c commit ed94162

File tree

2 files changed

+22
-8
lines changed

2 files changed

+22
-8
lines changed

tools/release/amd64.Dockerfile

+11-4
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,13 @@ RUN dnf -y update \
5454
&& rm -rf /var/cache/dnf
5555
ENV JAVA_HOME=/usr/lib/jvm/java
5656

57+
# Update maven
58+
ADD https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz /usr/local
59+
RUN mkdir -p /usr/local/maven \
60+
&& tar xzvf /usr/local/apache-maven-3.9.9-bin.tar.gz --strip-components=1 -C /usr/local/maven \
61+
&& rm /usr/local/apache-maven-3.9.9-bin.tar.gz
62+
ENV PATH=/usr/local/maven/bin:$PATH
63+
5764
ENV TZ=America/Los_Angeles
5865
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
5966

@@ -67,9 +74,9 @@ WORKDIR /root
6774
# use ORTOOLS_GIT_SHA1 to modify the command
6875
# i.e. avoid docker reusing the cache when new commit is pushed
6976
ARG ORTOOLS_GIT_BRANCH
70-
ENV ORTOOLS_GIT_BRANCH ${ORTOOLS_GIT_BRANCH:-main}
77+
ENV ORTOOLS_GIT_BRANCH=${ORTOOLS_GIT_BRANCH:-main}
7178
ARG ORTOOLS_GIT_SHA1
72-
ENV ORTOOLS_GIT_SHA1 ${ORTOOLS_GIT_SHA1:-unknown}
79+
ENV ORTOOLS_GIT_SHA1=${ORTOOLS_GIT_SHA1:-unknown}
7380
RUN git clone -b "${ORTOOLS_GIT_BRANCH}" --single-branch https://github.com/google/or-tools \
7481
&& cd or-tools \
7582
&& git reset --hard "${ORTOOLS_GIT_SHA1}"
@@ -79,9 +86,9 @@ FROM devel AS delivery
7986
WORKDIR /root/or-tools
8087

8188
ARG ORTOOLS_TOKEN
82-
ENV ORTOOLS_TOKEN ${ORTOOLS_TOKEN}
89+
ENV ORTOOLS_TOKEN=${ORTOOLS_TOKEN}
8390
ARG ORTOOLS_DELIVERY
84-
ENV ORTOOLS_DELIVERY ${ORTOOLS_DELIVERY:-all}
91+
ENV ORTOOLS_DELIVERY=${ORTOOLS_DELIVERY:-all}
8592
RUN ./tools/release/build_delivery_linux.sh "${ORTOOLS_DELIVERY}"
8693

8794
# Publish delivery

tools/release/arm64.Dockerfile

+11-4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ RUN dnf -y update \
5959
&& rm -rf /var/cache/dnf
6060
ENV JAVA_HOME=/usr/lib/jvm/java
6161

62+
# Update maven
63+
ADD https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz /usr/local
64+
RUN mkdir -p /usr/local/maven \
65+
&& tar xzvf /usr/local/apache-maven-3.9.9-bin.tar.gz --strip-components=1 -C /usr/local/maven \
66+
&& rm /usr/local/apache-maven-3.9.9-bin.tar.gz
67+
ENV PATH=/usr/local/maven/bin:$PATH
68+
6269
ENV TZ=America/Los_Angeles
6370
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
6471

@@ -72,9 +79,9 @@ WORKDIR /root
7279
# use ORTOOLS_GIT_SHA1 to modify the command
7380
# i.e. avoid docker reusing the cache when new commit is pushed
7481
ARG ORTOOLS_GIT_BRANCH
75-
ENV ORTOOLS_GIT_BRANCH ${ORTOOLS_GIT_BRANCH:-main}
82+
ENV ORTOOLS_GIT_BRANCH=${ORTOOLS_GIT_BRANCH:-main}
7683
ARG ORTOOLS_GIT_SHA1
77-
ENV ORTOOLS_GIT_SHA1 ${ORTOOLS_GIT_SHA1:-unknown}
84+
ENV ORTOOLS_GIT_SHA1=${ORTOOLS_GIT_SHA1:-unknown}
7885
RUN git clone -b "${ORTOOLS_GIT_BRANCH}" --single-branch https://github.com/google/or-tools \
7986
&& cd or-tools \
8087
&& git reset --hard "${ORTOOLS_GIT_SHA1}"
@@ -84,9 +91,9 @@ FROM devel AS delivery
8491
WORKDIR /root/or-tools
8592

8693
ARG ORTOOLS_TOKEN
87-
ENV ORTOOLS_TOKEN ${ORTOOLS_TOKEN}
94+
ENV ORTOOLS_TOKEN=${ORTOOLS_TOKEN}
8895
ARG ORTOOLS_DELIVERY
89-
ENV ORTOOLS_DELIVERY ${ORTOOLS_DELIVERY:-all}
96+
ENV ORTOOLS_DELIVERY=${ORTOOLS_DELIVERY:-all}
9097
RUN ./tools/release/build_delivery_linux.sh "${ORTOOLS_DELIVERY}"
9198

9299
# Publish delivery

0 commit comments

Comments
 (0)