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.

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

Jump to bottom

Merge main to dev #761

Closed
wants to merge 4 commits into from
Closed

Merge main to dev #761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68bfc66
Merge pull request #755 from rstudio/dev
ianpittwood May 7, 2024
0d031b6
Bump Connect to version 2024.04.1
Lytol May 7, 2024
46bf105
Merge pull request #757 from rstudio/connect-2024.04.1-docker
ianpittwood May 7, 2024
75b9818
Fix image short sha (#760)
ianpittwood May 8, 2024
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
3 changes: 2 additions & 1 deletion .github/workflows/build-bake.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
cancel-in-progress: true

outputs:
GIT_SHA: ${{ steps.checkout.outputs.sha }}
GIT_SHA: ${{ steps.get-git-sha.outputs.GIT_SHA }}

steps:
- name: Checkout
Expand All @@ -29,6 +29,7 @@ jobs:
run: |
GIT_SHA=$(git rev-parse --short HEAD)
echo "GIT_SHA=$GIT_SHA" >> $GITHUB_OUTPUT
echo "$GIT_SHA"
base:
needs: [setup]
Expand Down
2 changes: 1 addition & 1 deletion Justfile
View file
Open in desktop
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.04.0"
RSC_VERSION := "2024.04.1"
RSPM_VERSION := "2024.04.0-20"
RSW_VERSION := "2024.04.0+735.pro3"

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
Expand Up @@ -9,7 +9,7 @@ RUN apt-get update && \
apt-get install -y --no-install-recommends ca-certificates curl && \
rm -rf /var/lib/apt/lists/*

ARG RSC_VERSION=2024.04.0
ARG RSC_VERSION=2024.04.1
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.04.0`, `ubuntu2204-2024.04.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
* [`jammy`, `ubuntu2204`, `jammy-2024.04.1`, `ubuntu2204-2024.04.1`](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.04.0
just build ubuntu2204 2024.04.1
```

## 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.04.0-dev-326
docker history rstudio/rstudio-connect-content-init-preview:2024.04.1-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.04.0
RSC_VERSION=2024.04.1
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
Expand Up @@ -7,7 +7,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 RSC_VERSION=2024.04.0
ARG RSC_VERSION=2024.04.1
ARG QUARTO_VERSION=1.4.552
ARG SCRIPTS_DIR=/opt/positscripts

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.04.0`, `ubuntu2204-2024.04.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
* [`jammy`, `ubuntu2204`, `jammy-2024.04.1`, `ubuntu2204-2024.04.1`](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,6 +1,6 @@
### Variable definitions ###
variable CONNECT_VERSION {
default = "2024.04.0"
default = "2024.04.1"
}

variable PACKAGE_MANAGER_VERSION {
Expand All @@ -24,7 +24,7 @@ variable DEFAULT_JUPYTERLAB_VERSION {
}

variable GIT_SHA {
default = ""
default = null
}

function tag_safe_version {
Expand Down
Loading