Fix dockerfile ENV usage

This commit is contained in:
Corentin Le Molgat
2025-06-23 13:57:57 +02:00
parent 6c973a4d53
commit 73bfae57e8
22 changed files with 55 additions and 55 deletions

View File

@@ -1,6 +1,6 @@
FROM minizinc/mznc2025:latest AS env
ENV SRC_GIT_BRANCH v99bugfix
ENV SRC_GIT_BRANCH=v99bugfix
ENV TZ=America/Los_Angeles
@@ -31,4 +31,4 @@ RUN cp /root/or-tools/ortools/flatzinc/mznlib/*mzn /entry_data/mzn-lib
# Patch the run scripts
RUN sed -i -e "s/-G/--fzn-flags --params=use_ls_only:true -p 1 -G/g" /minizinc/mzn-exec-fd
RUN sed -i -e "s/-G/--fzn-flags --params=use_ls_only:true,num_workers:3 -G/g" /minizinc/mzn-exec-free
RUN sed -i -e "s/-G/--fzn-flags --params=use_ls_only:true -G/g" /minizinc/mzn-exec-par
RUN sed -i -e "s/-G/--fzn-flags --params=use_ls_only:true -G/g" /minizinc/mzn-exec-par

View File

@@ -1,6 +1,6 @@
FROM minizinc/mznc2025:latest AS env
ENV SRC_GIT_BRANCH v99bugfix
ENV SRC_GIT_BRANCH=v99bugfix
ENV TZ=America/Los_Angeles

View File

@@ -62,12 +62,12 @@ COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
ARG SRC_GIT_BRANCH
ENV SRC_GIT_BRANCH ${SRC_GIT_BRANCH:-main}
ENV SRC_GIT_BRANCH=${SRC_GIT_BRANCH:-main}
ARG SRC_GIT_SHA1
ENV SRC_GIT_SHA1 ${SRC_GIT_SHA1:-unknown}
ARG OR_TOOLS_PATCH
ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999}
ENV OR_TOOLS_PATCH=${OR_TOOLS_PATCH:-9999}
# Download sources
# use SRC_GIT_SHA1 to modify the command

View File

@@ -40,12 +40,12 @@ COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
ARG SRC_GIT_BRANCH
ENV SRC_GIT_BRANCH ${SRC_GIT_BRANCH:-main}
ENV SRC_GIT_BRANCH=${SRC_GIT_BRANCH:-main}
ARG SRC_GIT_SHA1
ENV SRC_GIT_SHA1 ${SRC_GIT_SHA1:-unknown}
ARG OR_TOOLS_PATCH
ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999}
ENV OR_TOOLS_PATCH=${OR_TOOLS_PATCH:-9999}
# Download sources
# use SRC_GIT_SHA1 to modify the command

View File

@@ -41,12 +41,12 @@ COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
ARG SRC_GIT_BRANCH
ENV SRC_GIT_BRANCH ${SRC_GIT_BRANCH:-main}
ENV SRC_GIT_BRANCH=${SRC_GIT_BRANCH:-main}
ARG SRC_GIT_SHA1
ENV SRC_GIT_SHA1 ${SRC_GIT_SHA1:-unknown}
ARG OR_TOOLS_PATCH
ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999}
ENV OR_TOOLS_PATCH=${OR_TOOLS_PATCH:-9999}
# Download sources
# use SRC_GIT_SHA1 to modify the command

View File

@@ -55,12 +55,12 @@ COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
ARG SRC_GIT_BRANCH
ENV SRC_GIT_BRANCH ${SRC_GIT_BRANCH:-main}
ENV SRC_GIT_BRANCH=${SRC_GIT_BRANCH:-main}
ARG SRC_GIT_SHA1
ENV SRC_GIT_SHA1 ${SRC_GIT_SHA1:-unknown}
ARG OR_TOOLS_PATCH
ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999}
ENV OR_TOOLS_PATCH=${OR_TOOLS_PATCH:-9999}
# Download sources
# use SRC_GIT_SHA1 to modify the command

View File

@@ -49,12 +49,12 @@ COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
ARG SRC_GIT_BRANCH
ENV SRC_GIT_BRANCH ${SRC_GIT_BRANCH:-main}
ENV SRC_GIT_BRANCH=${SRC_GIT_BRANCH:-main}
ARG SRC_GIT_SHA1
ENV SRC_GIT_SHA1 ${SRC_GIT_SHA1:-unknown}
ARG OR_TOOLS_PATCH
ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999}
ENV OR_TOOLS_PATCH=${OR_TOOLS_PATCH:-9999}
# Download sources
# use SRC_GIT_SHA1 to modify the command

View File

@@ -50,12 +50,12 @@ COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
ARG SRC_GIT_BRANCH
ENV SRC_GIT_BRANCH ${SRC_GIT_BRANCH:-main}
ENV SRC_GIT_BRANCH=${SRC_GIT_BRANCH:-main}
ARG SRC_GIT_SHA1
ENV SRC_GIT_SHA1 ${SRC_GIT_SHA1:-unknown}
ARG OR_TOOLS_PATCH
ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999}
ENV OR_TOOLS_PATCH=${OR_TOOLS_PATCH:-9999}
# Download sources
# use SRC_GIT_SHA1 to modify the command

View File

@@ -52,12 +52,12 @@ COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
ARG SRC_GIT_BRANCH
ENV SRC_GIT_BRANCH ${SRC_GIT_BRANCH:-main}
ENV SRC_GIT_BRANCH=${SRC_GIT_BRANCH:-main}
ARG SRC_GIT_SHA1
ENV SRC_GIT_SHA1 ${SRC_GIT_SHA1:-unknown}
ARG OR_TOOLS_PATCH
ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999}
ENV OR_TOOLS_PATCH=${OR_TOOLS_PATCH:-9999}
# Download sources
# use SRC_GIT_SHA1 to modify the command

View File

@@ -48,12 +48,12 @@ COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
ARG SRC_GIT_BRANCH
ENV SRC_GIT_BRANCH ${SRC_GIT_BRANCH:-main}
ENV SRC_GIT_BRANCH=${SRC_GIT_BRANCH:-main}
ARG SRC_GIT_SHA1
ENV SRC_GIT_SHA1 ${SRC_GIT_SHA1:-unknown}
ARG OR_TOOLS_PATCH
ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999}
ENV OR_TOOLS_PATCH=${OR_TOOLS_PATCH:-9999}
# Download sources
# use SRC_GIT_SHA1 to modify the command

View File

@@ -50,12 +50,12 @@ COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
ARG SRC_GIT_BRANCH
ENV SRC_GIT_BRANCH ${SRC_GIT_BRANCH:-main}
ENV SRC_GIT_BRANCH=${SRC_GIT_BRANCH:-main}
ARG SRC_GIT_SHA1
ENV SRC_GIT_SHA1 ${SRC_GIT_SHA1:-unknown}
ARG OR_TOOLS_PATCH
ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999}
ENV OR_TOOLS_PATCH=${OR_TOOLS_PATCH:-9999}
# Download sources
# use SRC_GIT_SHA1 to modify the command

View File

@@ -50,12 +50,12 @@ COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
ARG SRC_GIT_BRANCH
ENV SRC_GIT_BRANCH ${SRC_GIT_BRANCH:-main}
ENV SRC_GIT_BRANCH=${SRC_GIT_BRANCH:-main}
ARG SRC_GIT_SHA1
ENV SRC_GIT_SHA1 ${SRC_GIT_SHA1:-unknown}
ARG OR_TOOLS_PATCH
ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999}
ENV OR_TOOLS_PATCH=${OR_TOOLS_PATCH:-9999}
# Download sources
# use SRC_GIT_SHA1 to modify the command

View File

@@ -48,12 +48,12 @@ COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
ARG SRC_GIT_BRANCH
ENV SRC_GIT_BRANCH ${SRC_GIT_BRANCH:-main}
ENV SRC_GIT_BRANCH=${SRC_GIT_BRANCH:-main}
ARG SRC_GIT_SHA1
ENV SRC_GIT_SHA1 ${SRC_GIT_SHA1:-unknown}
ARG OR_TOOLS_PATCH
ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999}
ENV OR_TOOLS_PATCH=${OR_TOOLS_PATCH:-9999}
# Download sources
# use SRC_GIT_SHA1 to modify the command

View File

@@ -62,12 +62,12 @@ COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
ARG SRC_GIT_BRANCH
ENV SRC_GIT_BRANCH ${SRC_GIT_BRANCH:-main}
ENV SRC_GIT_BRANCH=${SRC_GIT_BRANCH:-main}
ARG SRC_GIT_SHA1
ENV SRC_GIT_SHA1 ${SRC_GIT_SHA1:-unknown}
ARG OR_TOOLS_PATCH
ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999}
ENV OR_TOOLS_PATCH=${OR_TOOLS_PATCH:-9999}
# Download sources
# use SRC_GIT_SHA1 to modify the command

View File

@@ -66,12 +66,12 @@ COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
ARG SRC_GIT_BRANCH
ENV SRC_GIT_BRANCH ${SRC_GIT_BRANCH:-main}
ENV SRC_GIT_BRANCH=${SRC_GIT_BRANCH:-main}
ARG SRC_GIT_SHA1
ENV SRC_GIT_SHA1 ${SRC_GIT_SHA1:-unknown}
ARG OR_TOOLS_PATCH
ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999}
ENV OR_TOOLS_PATCH=${OR_TOOLS_PATCH:-9999}
# Download sources
# use SRC_GIT_SHA1 to modify the command

View File

@@ -64,12 +64,12 @@ COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
ARG SRC_GIT_BRANCH
ENV SRC_GIT_BRANCH ${SRC_GIT_BRANCH:-main}
ENV SRC_GIT_BRANCH=${SRC_GIT_BRANCH:-main}
ARG SRC_GIT_SHA1
ENV SRC_GIT_SHA1 ${SRC_GIT_SHA1:-unknown}
ARG OR_TOOLS_PATCH
ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999}
ENV OR_TOOLS_PATCH=${OR_TOOLS_PATCH:-9999}
# Download sources
# use SRC_GIT_SHA1 to modify the command

View File

@@ -58,12 +58,12 @@ COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
ARG SRC_GIT_BRANCH
ENV SRC_GIT_BRANCH ${SRC_GIT_BRANCH:-main}
ENV SRC_GIT_BRANCH=${SRC_GIT_BRANCH:-main}
ARG SRC_GIT_SHA1
ENV SRC_GIT_SHA1 ${SRC_GIT_SHA1:-unknown}
ARG OR_TOOLS_PATCH
ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999}
ENV OR_TOOLS_PATCH=${OR_TOOLS_PATCH:-9999}
# Download sources
# use SRC_GIT_SHA1 to modify the command

View File

@@ -58,12 +58,12 @@ COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
ARG SRC_GIT_BRANCH
ENV SRC_GIT_BRANCH ${SRC_GIT_BRANCH:-main}
ENV SRC_GIT_BRANCH=${SRC_GIT_BRANCH:-main}
ARG SRC_GIT_SHA1
ENV SRC_GIT_SHA1 ${SRC_GIT_SHA1:-unknown}
ARG OR_TOOLS_PATCH
ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999}
ENV OR_TOOLS_PATCH=${OR_TOOLS_PATCH:-9999}
# Download sources
# use SRC_GIT_SHA1 to modify the command

View File

@@ -22,12 +22,12 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
## OR-TOOLS ##
################
FROM env AS devel
ENV GIT_URL https://github.com/google/or-tools
ENV GIT_URL=https://github.com/google/or-tools
ARG GIT_BRANCH
ENV GIT_BRANCH ${GIT_BRANCH:-main}
ENV GIT_BRANCH=${GIT_BRANCH:-main}
ARG GIT_SHA1
ENV GIT_SHA1 ${GIT_SHA1:-unknown}
ENV GIT_SHA1=${GIT_SHA1:-unknown}
# Download sources
# use GIT_SHA1 to modify the command
@@ -38,9 +38,9 @@ RUN git clone -b "${GIT_BRANCH}" --single-branch "$GIT_URL" /project \
WORKDIR /project
# Copy build script and setup env
ENV PLATFORM x86_64
ENV PLATFORM=x86_64
ARG PYTHON_VERSION
ENV PYTHON_VERSION ${PYTHON_VERSION:-3}
ENV PYTHON_VERSION=${PYTHON_VERSION:-3}
COPY build-manylinux.sh .
RUN chmod a+x "build-manylinux.sh"

View File

@@ -17,12 +17,12 @@ CMD ["/bin/sh"]
## OR-TOOLS ##
################
FROM env AS devel
ENV GIT_URL https://github.com/google/or-tools
ENV GIT_URL=https://github.com/google/or-tools
ARG GIT_BRANCH
ENV GIT_BRANCH ${GIT_BRANCH:-main}
ENV GIT_BRANCH=${GIT_BRANCH:-main}
ARG GIT_SHA1
ENV GIT_SHA1 ${GIT_SHA1:-unknown}
ENV GIT_SHA1=${GIT_SHA1:-unknown}
# Download sources
# use GIT_SHA1 to modify the command
@@ -33,9 +33,9 @@ RUN git clone -b "${GIT_BRANCH}" --single-branch "$GIT_URL" /project \
WORKDIR /project
# Copy build script and setup env
ENV PLATFORM x86_64
ENV PLATFORM=x86_64
ARG PYTHON_VERSION
ENV PYTHON_VERSION ${PYTHON_VERSION:-3}
ENV PYTHON_VERSION=${PYTHON_VERSION:-3}
COPY build-musllinux.sh .
RUN chmod a+x "build-musllinux.sh"

View File

@@ -24,12 +24,12 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
## OR-TOOLS ##
################
FROM env AS devel
ENV GIT_URL https://github.com/google/or-tools
ENV GIT_URL=https://github.com/google/or-tools
ARG GIT_BRANCH
ENV GIT_BRANCH ${GIT_BRANCH:-main}
ENV GIT_BRANCH=${GIT_BRANCH:-main}
ARG GIT_SHA1
ENV GIT_SHA1 ${GIT_SHA1:-unknown}
ENV GIT_SHA1=${GIT_SHA1:-unknown}
# Download sources
# use GIT_SHA1 to modify the command
@@ -40,9 +40,9 @@ RUN git clone -b "${GIT_BRANCH}" --single-branch "$GIT_URL" /project \
WORKDIR /project
# Copy build script and setup env
ENV PLATFORM aarch64
ENV PLATFORM=aarch64
ARG PYTHON_VERSION
ENV PYTHON_VERSION ${PYTHON_VERSION:-3}
ENV PYTHON_VERSION=${PYTHON_VERSION:-3}
COPY build-manylinux.sh .
RUN chmod a+x "build-manylinux.sh"

View File

@@ -17,12 +17,12 @@ CMD ["/bin/sh"]
## OR-TOOLS ##
################
FROM env AS devel
ENV GIT_URL https://github.com/google/or-tools
ENV GIT_URL=https://github.com/google/or-tools
ARG GIT_BRANCH
ENV GIT_BRANCH ${GIT_BRANCH:-main}
ENV GIT_BRANCH=${GIT_BRANCH:-main}
ARG GIT_SHA1
ENV GIT_SHA1 ${GIT_SHA1:-unknown}
ENV GIT_SHA1=${GIT_SHA1:-unknown}
# Download sources
# use GIT_SHA1 to modify the command
@@ -33,9 +33,9 @@ RUN git clone -b "${GIT_BRANCH}" --single-branch "${GIT_URL}" /project \
WORKDIR /project
# Copy build script and setup env
ENV PLATFORM aarch64
ENV PLATFORM=aarch64
ARG PYTHON_VERSION
ENV PYTHON_VERSION ${PYTHON_VERSION:-3}
ENV PYTHON_VERSION=${PYTHON_VERSION:-3}
COPY build-musllinux.sh .
RUN chmod a+x "build-musllinux.sh"