Skip to content

Merge main into dev #921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 16 commits into from
Closed

Merge main into dev #921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fe05240
Bump Connect to version 2025.01.0
lucasrod16 Jan 30, 2025
e818804
Upgrade actions versions
ianpittwood Jan 24, 2025
a0156d7
Merge pull request #893 from rstudio/connect-2025.01.0-docker
lucasrod16 Jan 30, 2025
e765985
ci: update readme path for content-base and content-pro dockerhub repos
lucasrod16 Jan 31, 2025
1e83081
Merge pull request #895 from rstudio/lucas-894-readme-paths
lucasrod16 Feb 4, 2025
9fb6666
Merge pull request #897 from rstudio/dev
bschwedler Feb 14, 2025
f806238
Merge pull request #901 from rstudio/dev
bschwedler Feb 21, 2025
586a2c8
Bump Connect to version 2025.02.0
dethmasque Feb 26, 2025
e1b7e45
Merge pull request #903 from rstudio/connect-2025.02.0-docker
dethmasque Feb 26, 2025
a343e37
Merge pull request #907 from rstudio/dev
ianpittwood Mar 13, 2025
5d8cf7a
Bump Connect to version 2025.03.0
tdstein Mar 26, 2025
37503fa
Merge pull request #909 from rstudio/connect-2025.03.0-docker
tdstein Mar 26, 2025
5d2f68a
Bump PPM version to 2025.04.0-4
nodivbyzero Apr 16, 2025
6720a4d
Merge pull request #912 from rstudio/ppm-2025.04.0-4-dev-to-main
nodivbyzero Apr 16, 2025
02e5be6
Bump Connect to version 2025.04.0
edavidaja Apr 28, 2025
0b2ab15
Merge pull request #918 from rstudio/connect-2025.04.0-docker
edavidaja Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/update-readme.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
- {prefix: 'rstudio-', repository: 'workbench', readme_path: './workbench/README.md'}
- {prefix: 'rstudio-', repository: 'connect', readme_path: './connect/README.md'}
- {prefix: 'rstudio-', repository: 'connect-content-init', readme_path: './connect-content-init/README.md'}
- {prefix: '', repository: 'content-base', readme_path: './content/base/README.md'}
- {prefix: '', repository: 'content-pro', readme_path: './content/pro/README.md'}
- {prefix: '', repository: 'content-base', readme_path: './content/README.md'}
- {prefix: '', repository: 'content-pro', readme_path: './content/README.md'}
- {prefix: 'rstudio-', repository: 'package-manager', readme_path: './package-manager/README.md'}
- {prefix: '', repository: 'r-session-complete', readme_path: './r-session-complete/README.md'}
- {prefix: 'rstudio-', repository: 'workbench-for-microsoft-azure-ml', readme_path: './workbench-for-microsoft-azure-ml/README.md'}
Expand Down
4 changes: 2 additions & 2 deletions Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" }

BUILDX_PATH := ""

RSC_VERSION := "2024.12.0"
RSPM_VERSION := "2024.11.0-7"
RSC_VERSION := "2025.04.0"
RSPM_VERSION := "2025.04.0-4"
RSW_VERSION := "2024.12.1+563.pro5"

DRIVERS_VERSION := "2023.05.0"
Expand Down
2 changes: 1 addition & 1 deletion connect-content-init/Dockerfile.ubuntu2204
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Tag from https://hub.docker.com/_/ubuntu/
FROM ubuntu:22.04 as build

Check failure on line 2 in connect-content-init/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / lint-connect-content-init-ubuntu2204 

DL3049 info: Label `maintainer` is missing.

Check warning on line 2 in connect-content-init/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / Connect Content Init

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 2 in connect-content-init/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / Connect Content Init

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 2 in connect-content-init/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / Connect Content Init - Daily

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 2 in connect-content-init/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / Connect Content Init - Daily

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

# Install required tools:
# - ca-certificates installs necessary certificates to use cURL with HTTPS websites
Expand All @@ -9,7 +9,7 @@
apt-get install -y --no-install-recommends ca-certificates curl && \
rm -rf /var/lib/apt/lists/*

ARG RSC_VERSION=2024.12.0
ARG RSC_VERSION=2025.04.0
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN mkdir -p /rsc-staging && \
RSC_VERSION_URL=$(echo -n "${RSC_VERSION}" | sed 's/+/%2B/g') && \
Expand Down
6 changes: 3 additions & 3 deletions connect-content-init/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

# Supported tags and respective Dockerfile links

* [`jammy`, `ubuntu2204`, `jammy-2024.12.0`, `ubuntu2204-2024.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
* [`jammy`, `ubuntu2204`, `jammy-2025.04.0`, `ubuntu2204-2025.04.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)

# RStudio Connect Content Init Container

Expand All @@ -31,7 +31,7 @@ The version of the release package to use can be overridden with the
`RSC_VERSION` build arg.

```console
just build ubuntu2204 2024.12.0
just build ubuntu2204 2025.04.0
```

## Testing
Expand All @@ -56,7 +56,7 @@ just test
You can see the different layers that make up the image:

```console
docker history rstudio/rstudio-connect-content-init-preview:2024.12.0-dev-326
docker history rstudio/rstudio-connect-content-init-preview:2025.04.0-dev-326
```

NOTE: almost all the image size is pandoc.
Expand Down
2 changes: 1 addition & 1 deletion connect/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RSC_VERSION=2024.12.0
RSC_VERSION=2025.04.0
R_VERSION=4.2.3
R_VERSION_ALT=4.1.3
PYTHON_VERSION=3.9.17
Expand Down
2 changes: 1 addition & 1 deletion connect/Dockerfile.ubuntu2204
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1-labs
FROM product-base-pro as build

Check failure on line 2 in connect/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / lint-connect-ubuntu2204 

DL3049 info: Label `maintainer` is missing.

Check warning on line 2 in connect/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / Connect

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 2 in connect/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / Connect - Daily

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

COPY --chmod=0775 startup.sh /usr/local/bin/startup.sh

Expand All @@ -7,7 +7,7 @@
ARG R_VERSION_ALT=4.1.3
ARG PYTHON_VERSION=3.9.17
ARG PYTHON_VERSION_ALT=3.8.17
ARG RSC_VERSION=2024.12.0
ARG RSC_VERSION=2025.04.0
ARG QUARTO_VERSION=1.4.557
ARG SCRIPTS_DIR=/opt/positscripts

Expand Down Expand Up @@ -48,9 +48,9 @@

### Configure Connect ###
EXPOSE 3939/tcp
ENV RSC_LICENSE ""

Check warning on line 51 in connect/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / Connect

Legacy key/value format with whitespace separator should not be used 

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format
More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 51 in connect/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / Connect

Legacy key/value format with whitespace separator should not be used 

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format
More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 51 in connect/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / Connect - Daily

Legacy key/value format with whitespace separator should not be used 

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format
More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
ENV RSC_LICENSE_SERVER ""

Check warning on line 52 in connect/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / Connect

Legacy key/value format with whitespace separator should not be used 

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format
More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 52 in connect/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / Connect - Daily

Legacy key/value format with whitespace separator should not be used 

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format
More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
ENV STARTUP_DEBUG_MODE 0

Check warning on line 53 in connect/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / Connect

Legacy key/value format with whitespace separator should not be used 

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format
More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 53 in connect/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / Connect - Daily

Legacy key/value format with whitespace separator should not be used 

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format
More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
COPY rstudio-connect.gcfg /etc/rstudio-connect/rstudio-connect.gcfg
RUN sed -i "s/{{PYTHON_VERSION}}/${PYTHON_VERSION}/g" /etc/rstudio-connect/rstudio-connect.gcfg \
&& sed -i "s/{{PYTHON_VERSION_ALT}}/${PYTHON_VERSION_ALT}/g" /etc/rstudio-connect/rstudio-connect.gcfg \
Expand Down
2 changes: 1 addition & 1 deletion connect/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

# Supported tags and respective Dockerfile links

* [`jammy`, `ubuntu2204`, `jammy-2024.12.0`, `ubuntu2204-2024.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
* [`jammy`, `ubuntu2204`, `jammy-2025.04.0`, `ubuntu2204-2025.04.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)

# What is Posit Connect?

Expand Down
4 changes: 2 additions & 2 deletions docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
### Variable definitions ###
variable CONNECT_VERSION {
default = "2024.12.0"
default = "2025.04.0"
}

variable PACKAGE_MANAGER_VERSION {
default = "2024.11.0-7"
default = "2025.04.0-4"
}

variable WORKBENCH_VERSION {
Expand Down
2 changes: 1 addition & 1 deletion package-manager/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RSPM_VERSION=2024.11.0-7
RSPM_VERSION=2025.04.0-4
R_VERSION=4.4.0
R_VERSION_ALT=4.1.3
PYTHON_VERSION=3.9.17
Expand Down
2 changes: 1 addition & 1 deletion package-manager/Dockerfile.ubuntu2204
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM product-base as build

Check failure on line 1 in package-manager/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / lint-package-manager-ubuntu2204 

DL3049 info: Label `maintainer` is missing.

Check warning on line 1 in package-manager/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / Package Manager

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in package-manager/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / Package Manager

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in package-manager/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / Package Manager - Daily

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in package-manager/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / Package Manager - Daily

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in package-manager/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / Package Manager - Preview

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in package-manager/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / Package Manager - Preview

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

ARG PYTHON_VERSION=3.9.17
ARG PYTHON_VERSION_ALT=3.8.17
Expand All @@ -18,9 +18,9 @@
apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*

# Download RStudio Package Manager ---------------------------------------------#
ARG RSPM_VERSION=2024.11.0-7
ARG RSPM_VERSION=2025.04.0-4
ARG RSPM_DOWNLOAD_URL=https://cdn.rstudio.com/package-manager/deb/amd64
RUN curl -fsSL -O ${RSPM_DOWNLOAD_URL}/rstudio-pm_${RSPM_VERSION}_amd64.deb \

Check failure on line 23 in package-manager/Dockerfile.ubuntu2204

View workflow job for this annotation

GitHub Actions / lint-package-manager-ubuntu2204 

DL3015 info: Avoid additional packages by specifying `--no-install-recommends`
# Pre 7/25/23 packages
&& gpg --keyserver keyserver.ubuntu.com --recv-keys 3F32EE77E331692F \
# Post 7/25 packages
Expand Down
2 changes: 1 addition & 1 deletion package-manager/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# Supported tags and respective Dockerfile links

* [`jammy`, `ubuntu2204`, `jammy-2024.08.2`, `ubuntu2204-2024.08.2`](https://github.com/rstudio/rstudio-docker-products/blob/main/package-manager/Dockerfile.ubuntu2204)
* [`jammy`, `ubuntu2204`, `jammy-2025.04.0`, `ubuntu2204-2025.04.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/package-manager/Dockerfile.ubuntu2204)

# What is RStudio Package Manager?

Expand Down
Loading