Skip to content
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.

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

Bump Connect to version 2025.01.0 #893

Merged
merged 2 commits into from
Jan 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/actions/bake-test-push/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ runs:
# Build, test, and push image
- name: Build
id: build
uses: docker/bake-action@v4
uses: docker/bake-action@v5
with:
targets: "${{ inputs.target }}"
push: false
Expand Down Expand Up @@ -154,7 +154,7 @@ runs:
category: "${{ inputs.target }}-snyk-vulnerabilities"

- name: Push - ${{ inputs.push-image }}
uses: docker/bake-action@v4
uses: docker/bake-action@v5
with:
targets: "${{ inputs.target }}"
push: ${{ inputs.push-image }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clean-registry.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: cleanup-dockerhub
steps:
- name: Check Out Repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Run Script
run: ./tools/dockerhub_clean.py
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
uses: actions/checkout@v4

- name: Run Hadolint
uses: hadolint/hadolint-action@v3.0.0
uses: hadolint/hadolint-action@v3.1.0
with:
dockerfile: ${{ matrix.config.product }}/Dockerfile.${{ matrix.config.os }}
config: ./hadolint.yaml
2 changes: 1 addition & 1 deletion .github/workflows/update-readme.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
uses: actions/checkout@v3

- name: Docker Hub Description
uses: peter-evans/dockerhub-description@v3.1.2
uses: peter-evans/dockerhub-description@v4.0.0
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" }

BUILDX_PATH := ""

RSC_VERSION := "2024.12.0"
RSC_VERSION := "2025.01.0"
RSPM_VERSION := "2024.11.0-7"
RSW_VERSION := "2024.12.0+467.pro1"

Expand Down
2 changes: 1 addition & 1 deletion connect-content-init/Dockerfile.ubuntu2204
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.01.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
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.01.0`, `ubuntu2204-2025.01.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.01.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.01.0-dev-326
```

NOTE: almost all the image size is pandoc.
Expand Down
2 changes: 1 addition & 1 deletion connect/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RSC_VERSION=2024.12.0
RSC_VERSION=2025.01.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
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.01.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 - 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/

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

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
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.01.0`, `ubuntu2204-2025.01.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)

# What is Posit Connect?

Expand Down
2 changes: 1 addition & 1 deletion docker-bake.hcl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### Variable definitions ###
variable CONNECT_VERSION {
default = "2024.12.0"
default = "2025.01.0"
}

variable PACKAGE_MANAGER_VERSION {
Expand Down
Loading