Skip to content

Commit

Permalink
Update Pro Drivers to 2023.12.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@ianpittwood
ianpittwood committed Feb 1, 2024
1 parent ccde28d commit 3f27e46
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 30 deletions.
4 changes: 4 additions & 0 deletions NEWS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ changed in each image.

This file only captures pervasive, repository-wide changes.

# 2024-02-01

- Update Pro Drivers to 2023.12.1

# 2023-08-07

- Removed base image Ubuntu 18.04 builds.
Expand Down
2 changes: 1 addition & 1 deletion ci.Justfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ R_VERSION_ALT := "4.1.3"
PYTHON_VERSION := "3.9.17"
PYTHON_VERSION_ALT := "3.8.17"

DRIVERS_VERSION := "2023.05.0"
DRIVERS_VERSION := "2023.12.1"
DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"

QUARTO_VERSION := "1.3.340"
Expand Down
42 changes: 21 additions & 21 deletions content/matrix.json
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
[
{"r": "3.1.3", "py": "2.7.18", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.2.5", "py": "2.7.18", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.3.3", "py": "3.6.13", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.4.4", "py": "3.6.13", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.4.4", "py": "3.7.10", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.5.3", "py": "2.7.18", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.5.3", "py": "3.7.10", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.6.3", "py": "2.7.18", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.6.3", "py": "3.6.13", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.6.3", "py": "3.8.8", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "4.0.5", "py": "3.6.13", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "4.0.5", "py": "3.7.10", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "4.0.5", "py": "3.8.8", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "4.0.5", "py": "3.9.2", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "4.1.0", "py": "3.8.8", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "4.1.0", "py": "3.9.2", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "4.1.3", "py": "3.10.4", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.6.3", "py": "3.8.16", "drivers": "2023.05.0", "os": "ubuntu2204", "os_alt": "jammy"},
{"r": "4.0.5", "py": "3.9.16", "drivers": "2023.05.0", "os": "ubuntu2204", "os_alt": "jammy"},
{"r": "4.1.3", "py": "3.10.11", "drivers": "2023.05.0", "os": "ubuntu2204", "os_alt": "jammy"},
{"r": "4.2.2", "py": "3.11.3", "drivers": "2023.05.0", "os": "ubuntu2204", "os_alt": "jammy"}
{"r": "3.1.3", "py": "2.7.18", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.2.5", "py": "2.7.18", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.3.3", "py": "3.6.13", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.4.4", "py": "3.6.13", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.4.4", "py": "3.7.10", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.5.3", "py": "2.7.18", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.5.3", "py": "3.7.10", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.6.3", "py": "2.7.18", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.6.3", "py": "3.6.13", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.6.3", "py": "3.8.8", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "4.0.5", "py": "3.6.13", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "4.0.5", "py": "3.7.10", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "4.0.5", "py": "3.8.8", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "4.0.5", "py": "3.9.2", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "4.1.0", "py": "3.8.8", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "4.1.0", "py": "3.9.2", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "4.1.3", "py": "3.10.4", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
{"r": "3.6.3", "py": "3.8.16", "drivers": "2023.12.1", "os": "ubuntu2204", "os_alt": "jammy"},
{"r": "4.0.5", "py": "3.9.16", "drivers": "2023.12.1", "os": "ubuntu2204", "os_alt": "jammy"},
{"r": "4.1.3", "py": "3.10.11", "drivers": "2023.12.1", "os": "ubuntu2204", "os_alt": "jammy"},
{"r": "4.2.2", "py": "3.11.3", "drivers": "2023.12.1", "os": "ubuntu2204", "os_alt": "jammy"}
]
2 changes: 1 addition & 1 deletion content/pro/Dockerfile.ubuntu1804
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM ${REGISTRY}/rstudio/content-base:r${R_VERSION}-py${PYTHON_VERSION}-ubuntu18
LABEL maintainer="RStudio Docker <[email protected]>"

# Install RStudio Professional Drivers ----------------------------------------#
ARG DRIVERS_VERSION=2023.05.0
ARG DRIVERS_VERSION=2023.12.1
ARG R_VERSION
ARG DEBIAN_FRONTEND=noninteractive

Expand Down
2 changes: 1 addition & 1 deletion content/pro/Dockerfile.ubuntu2204
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM ${REGISTRY}/rstudio/content-base:r${R_VERSION}-py${PYTHON_VERSION}-ubuntu22
LABEL maintainer="RStudio Docker <[email protected]>"

# Install RStudio Professional Drivers ----------------------------------------#
ARG DRIVERS_VERSION=2023.05.0
ARG DRIVERS_VERSION=2023.12.1
ARG R_VERSION
ARG DEBIAN_FRONTEND=noninteractive

Expand Down
2 changes: 1 addition & 1 deletion content/pro/Justfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ R_VERSION := "3.6.3"

PYTHON_VERSION := "3.9.5"

DRIVERS_VERSION := "2023.05.0"
DRIVERS_VERSION := "2023.12.1"
DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"

DEFAULT_TAG := IMAGE_PREFIX + PRODUCT + ":r" + R_VERSION + "-py" + PYTHON_VERSION + "-" + IMAGE_OS
Expand Down
2 changes: 1 addition & 1 deletion product/pro/Dockerfile.centos7
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ARG R_VERSION=4.2.0
ARG R_VERSION_ALT=3.6.2
ARG PYTHON_VERSION=3.9.14
ARG PYTHON_VERSION_ALT=3.8.15
ARG DRIVERS_VERSION=2023.05.0-1
ARG DRIVERS_VERSION=2023.12.1-1

RUN yum update -y \
&& yum install -y unixODBC unixODBC-devel \
Expand Down
2 changes: 1 addition & 1 deletion product/pro/Dockerfile.ubuntu2204
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ARG R_VERSION=4.2.3
ARG R_VERSION_ALT=4.1.3
ARG PYTHON_VERSION=3.9.17
ARG PYTHON_VERSION_ALT=3.8.17
ARG DRIVERS_VERSION=2023.05.0
ARG DRIVERS_VERSION=2023.12.1

RUN apt-get update \
&& apt-get install -yq --no-install-recommends unixodbc unixodbc-dev \
Expand Down
2 changes: 1 addition & 1 deletion product/pro/Justfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PYTHON_VERSION_ALT := "3.8.17"
TINI_VERSION := "0.19.0"
QUARTO_VERSION := "1.3.340"

DRIVERS_VERSION := "2023.05.0"
DRIVERS_VERSION := "2023.12.1"
DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"

_make-default-tag OS=IMAGE_OS:
Expand Down
2 changes: 1 addition & 1 deletion r-session-complete/.env
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
R_VERSION=4.1.0
PYTHON_VERSION=3.9.5
DRIVERS_VERSION=2023.05.0-1
DRIVERS_VERSION=2023.12.1-1
RSW_VERSION=2023.12.0+369.pro3
2 changes: 1 addition & 1 deletion r-session-complete/Justfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ IMAGE_OS := "ubuntu2204"
RSW_VERSION := "2023.12.0+369.pro3"
RSW_LICENSE := ""

DRIVERS_VERSION := "2023.05.0"
DRIVERS_VERSION := "2023.12.1"
DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"

R_VERSION := "4.2.3"
Expand Down

0 comments on commit 3f27e46

Please sign in to comment.