Skip to content

Commit

Permalink
Merge pull request #29 from nmfs-opensci/eeholmes-dev-2
Browse files Browse the repository at this point in the history
try different base
  • Loading branch information
eeholmes authored Oct 9, 2024
2 parents 54fa35e + 298aedd commit aae84ff
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions rocker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}

0 comments on commit aae84ff

Please sign in to comment.