Merge pull request #371 from MilesCranmer/update-docker

Update docker defaults: Julia=1.9.1; Python=3.10.11
MilesCranmer · Jul 8, 2023 · 7232595 · 7232595
2 parents fef0b90 + 744fcfb
commit 7232595
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/CI_docker.yml b/.github/workflows/CI_docker.yml
@@ -29,14 +29,12 @@ jobs:
         shell: bash
     strategy:
       matrix:
-        julia-version: ['1.8.2']
-        python-version: ['3.10.8']
         os: [ubuntu-latest]
         arch: ['linux/amd64']
 
     steps:
       - uses: actions/checkout@v3
       - name: Build docker
-        run: docker build --platform=${{ matrix.arch }} -t pysr --build-arg JLVERSION=${{ matrix.julia-version }} --build-arg PYVERSION=${{ matrix.python-version }} .
+        run: docker build --platform=${{ matrix.arch }} -t pysr .
       - name: Test docker
-        run: docker run --platform=${{ matrix.arch }} --rm pysr /bin/bash -c 'python3 -m pysr.test main && python3 -m pysr.test cli && python3 -m pysr.test env'
+        run: docker run --platform=${{ matrix.arch }} --rm pysr /bin/bash -c 'python3 -m pysr.test main && python3 -m pysr.test cli && python3 -m pysr.test env'
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
 # This builds a dockerfile containing a working copy of PySR
 # with all pre-requisites installed.
 
-ARG JLVERSION=1.8.2
-ARG PYVERSION=3.10.8
+ARG JLVERSION=1.9.1
+ARG PYVERSION=3.10.11
 ARG BASE_IMAGE=bullseye
 
 FROM julia:${JLVERSION}-${BASE_IMAGE} AS jl