Skip to content

Commit

Permalink
Add Jammy to update script
Browse files Browse the repository at this point in the history
  • Loading branch information
glin committed Apr 21, 2022
1 parent 5c059fe commit 5c05925
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion 4.1/jammy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
ARG BASE_IMAGE=rstudio/r-base
FROM ${BASE_IMAGE}:jammy

ARG R_VERSION=4.1.2
ARG R_VERSION=4.1.3
ARG OS_IDENTIFIER=ubuntu-2204

# Install R
Expand Down
2 changes: 1 addition & 1 deletion 4.1/jammy/hooks/post_push
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ function add_tag() {
docker push $DOCKER_REPO:$1
}

add_tag 4.1.2-jammy
add_tag 4.1.3-jammy
2 changes: 1 addition & 1 deletion devel/jammy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ RUN wget https://cdn.rstudio.com/r/${OS_IDENTIFIER}/pkgs/r-${R_VERSION}_1_amd64.
rm r-${R_VERSION}_1_amd64.deb && \
rm -rf /var/lib/apt/lists/*

CMD ["R"]
CMD ["R"]
3 changes: 2 additions & 1 deletion update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ declare -A r_versions=(
declare -A os_identifiers=(
[bionic]='ubuntu-1804'
[focal]='ubuntu-2004'
[jammy]='ubuntu-2204'
[centos7]='centos-7'
[rockylinux8]='centos-8'
[opensuse42]='opensuse-42'
Expand All @@ -40,7 +41,7 @@ for version in "${!r_versions[@]}"; do
mkdir -p $dir

case "$variant" in
bionic|focal) template='ubuntu'
bionic|focal|jammy) template='ubuntu'
;;
centos7|rockylinux8) template='centos'
;;
Expand Down

0 comments on commit 5c05925

Please sign in to comment.