Fix use of ARG in Dockerfile

.github/workflows/CI_docker.yml

@@ -29,12 +29,13 @@ jobs:
     strategy:
       matrix:
         julia-version: ['1.7.1']
-        python-version: ['3.9']
+        python-version: ['3.9.10']
         os: [ubuntu-latest]
-    
+        arch: ['linux/x86_64']
+
     steps:
       - uses: actions/[email protected]
       - name: Build docker
-        run: docker build -t pysr .
+        run: docker build -t pysr --build-arg ARCH=${{ matrix.arch }} --build-arg VERSION=${{ matrix.julia-version }} --build-arg PYVERSION=${{ matrix.python-version }} .
       - name: Test docker
-        run: docker run --rm pysr /bin/bash -c 'python3 -m unittest test.test'
+        run: docker run --platform=${{ matrix.arch }} --rm pysr /bin/bash -c 'python3 -m unittest test.test'

.github/workflows/CI_docker_large_nightly.yml

@@ -18,13 +18,13 @@ jobs:
       fail-fast: false
       matrix:
         julia-version: ['1.7.1']
-        python-version: ['3.9']
+        python-version: ['3.9.10']
         os: [ubuntu-latest]
-        arch: ['linux/x86_64', 'linux/amd64', 'linux/arm64', 'linux/aarch64']
+        arch: ['linux/x86_64', 'linux/amd64', 'linux/aarch64']
     
     steps:
       - uses: actions/[email protected]
       - name: Build docker
-        run: docker build --platform=${{ matrix.arch }} -t pysr .
+        run: docker build -t pysr --build-arg ARCH=${{ matrix.arch }} --build-arg VERSION=${{ matrix.julia-version }} --build-arg PYVERSION=${{ matrix.python-version }} .
       - name: Test docker
         run: docker run --platform=${{ matrix.arch }} --rm pysr /bin/bash -c 'python3 -m unittest test.test'

Dockerfile

@@ -1,9 +1,13 @@
 # This builds a dockerfile containing a working copy of PySR
 # with all pre-requisites installed.
 
+ARG ARCH=linux/amd64
 ARG VERSION=latest
 
-FROM julia:$VERSION
+FROM --platform=$ARCH julia:$VERSION
+
+# Need to use ARG after FROM, otherwise it won't get passed through.
+ARG PYVERSION=3.9.10
 
 RUN apt-get update && apt-get upgrade -y && apt-get install -y \
     make build-essential libssl-dev zlib1g-dev \
@@ -19,28 +23,28 @@ WORKDIR /pysr
 RUN curl https://pyenv.run | bash
 ENV PATH="/root/.pyenv/bin:$PATH"
 
-ENV PYTHON_VERSION="3.9.10"
-RUN PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install ${PYTHON_VERSION}
-ENV PATH="/root/.pyenv/versions/${PYTHON_VERSION}/bin:$PATH"
+# ENV PYVERSION=${PYVERSION}
+RUN PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install ${PYVERSION}
+# ENV PATH="/root/.pyenv/versions/$PYVERSION/bin:$PATH"
 
-# Install IPython and other useful libraries:
-RUN pip install ipython jupyter matplotlib
+# # Install IPython and other useful libraries:
+# RUN pip install ipython jupyter matplotlib
 
-# Caches install (https://stackoverflow.com/questions/25305788/how-to-avoid-reinstalling-packages-when-building-docker-image-for-python-project)
-ADD ./requirements.txt /pysr/requirements.txt
-RUN pip3 install -r /pysr/requirements.txt
+# # Caches install (https://stackoverflow.com/questions/25305788/how-to-avoid-reinstalling-packages-when-building-docker-image-for-python-project)
+# ADD ./requirements.txt /pysr/requirements.txt
+# RUN pip3 install -r /pysr/requirements.txt
 
-# Install PySR:
-# We do a minimal copy so it doesn't need to rerun at every file change:
-ADD ./setup.py /pysr/setup.py
-ADD ./README.md /pysr/README.md
-ADD ./pysr/ /pysr/pysr/
-RUN pip3 install .
+# # Install PySR:
+# # We do a minimal copy so it doesn't need to rerun at every file change:
+# ADD ./setup.py /pysr/setup.py
+# ADD ./README.md /pysr/README.md
+# ADD ./pysr/ /pysr/pysr/
+# RUN pip3 install .
 
-# Install Julia pre-requisites:
-RUN python3 -c 'import pysr; pysr.install()'
+# # Install Julia pre-requisites:
+# RUN python3 -c 'import pysr; pysr.install()'
 
-# Add tests
-ADD ./test/ /pysr/test/
+# # Add tests
+# ADD ./test/ /pysr/test/
 
-CMD ["bash"]
+# CMD ["bash"]