diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml index 366e929..4a1b3d3 100644 --- a/.github/workflows/build-dev.yaml +++ b/.github/workflows/build-dev.yaml @@ -44,6 +44,7 @@ jobs: REPO_DIR: /srv/repo # Fix man pages that are disabled by Ubuntu 18 minimal base image APPENDIX_FILE: "appendix" + REPO2DOCKER_EXTRA_ARGS: "--Repo2Docker.base_image=docker.io/library/ubuntu:jammy" # Lets us monitor disks getting full as images get bigger over time - name: Show how much disk space is left diff --git a/rocker.sh b/rocker.sh index caab143..b9277f5 100644 --- a/rocker.sh +++ b/rocker.sh @@ -11,7 +11,8 @@ R_VERSION="4.4.1" cd ${REPO_DIR} wget https://github.com/rocker-org/rocker-versioned2/archive/refs/tags/R${R_VERSION}.tar.gz tar zxvf R${R_VERSION}.tar.gz && \ -mv rocker-versioned2-R${R_VERSION}/scripts rocker_scripts && \ -mv rocker-versioned2-R${R_VERSION}/dockerfiles/verse_${R_VERSION}.Dockerfile rocker_scripts/verse_${R_VERSION}.Dockerfile && \ +mv rocker-versioned2-R${R_VERSION}/scripts /rocker_scripts && \ +mv rocker-versioned2-R${R_VERSION}/dockerfiles/verse_${R_VERSION}.Dockerfile /rocker_scripts/verse_${R_VERSION}.Dockerfile && \ +mv rocker-versioned2-R${R_VERSION}/dockerfiles/r-ver_${R_VERSION}.Dockerfile /rocker_scripts/r-ver_${R_VERSION}.Dockerfile && \ rm R${R_VERSION}.tar.gz && \ rm -rf rocker-versioned2-R${R_VERSION}