Skip to content

Commit

Permalink
Merge pull request #696 from rstudio/connect-2024.02.0-docker
Browse files Browse the repository at this point in the history
Bump Connect to version 2024.02.0
  • Loading branch information
plascaray authored Feb 27, 2024
2 parents 0e977e6 + e4793e8 commit b57617d
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" }

BUILDX_PATH := ""

RSC_VERSION := "2024.01.0"
RSC_VERSION := "2024.02.0"
RSPM_VERSION := "2023.12.0-13"
RSW_VERSION := "2023.12.1+402.pro1"

Expand Down
2 changes: 1 addition & 1 deletion connect-content-init/Dockerfile.ubuntu2204
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,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.01.0
ARG RSC_VERSION=2024.02.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
2 changes: 1 addition & 1 deletion connect-content-init/Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-"
PRODUCT := "connect-content-init"
IMAGE_OS := "ubuntu2204"

RSC_VERSION := "2024.01.0"
RSC_VERSION := "2024.02.0"
RSC_TAG_SAFE_VERSION := replace(RSC_VERSION, "+", "-")
RSC_LICENSE := ""

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.01.0`, `ubuntu2204-2024.01.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
* [`jammy`, `ubuntu2204`, `jammy-2024.02.0`, `ubuntu2204-2024.02.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.01.0
just build ubuntu2204 2024.02.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.01.0-dev-326
docker history rstudio/rstudio-connect-content-init-preview:2024.02.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.01.0
RSC_VERSION=2024.02.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
Expand Up @@ -13,7 +13,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.01.0
ARG RSC_VERSION=2024.02.0
SHELL [ "/bin/bash", "-o", "pipefail", "-c"]
RUN apt-get update --fix-missing \
&& apt-get install -yq --no-install-recommends \
Expand Down
2 changes: 1 addition & 1 deletion connect/Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-"
PRODUCT := "connect"
IMAGE_OS := "ubuntu2204"

RSC_VERSION := "2024.01.0"
RSC_VERSION := "2024.02.0"
RSC_LICENSE := ""
RSC_LICENSE_SERVER := ""

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.01.0`, `ubuntu2204-2024.01.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
* [`jammy`, `ubuntu2204`, `jammy-2024.02.0`, `ubuntu2204-2024.02.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-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ services:
context: ./connect
dockerfile: "Dockerfile.${IMAGE_OS:-ubuntu1804}"
args:
RSC_VERSION: 2024.01.0
image: rstudio/rstudio-connect:2024.01.0
RSC_VERSION: 2024.02.0
image: rstudio/rstudio-connect:2024.02.0
privileged: true
environment:
RSC_LICENSE: ${RSC_LICENSE}
Expand Down

0 comments on commit b57617d

Please sign in to comment.