Skip to content

Commit

Permalink
Merge pull request #473 from rstudio/chris-rsc-2023.01.1
Browse files Browse the repository at this point in the history
Bump Connect to 2023.01.1
  • Loading branch information
christierney authored Feb 13, 2023
2 parents be52f60 + 6d311f2 commit ff278db
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 16 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 := "2023.01.0"
RSC_VERSION := "2023.01.1"
RSPM_VERSION := "2022.11.4-20"
RSW_VERSION := "2022.12.0+353.pro20"

Expand Down
2 changes: 1 addition & 1 deletion connect-content-init/Dockerfile.ubuntu1804
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=2023.01.0
ARG RSC_VERSION=2023.01.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
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=2023.01.0
ARG RSC_VERSION=2023.01.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
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 := "ubuntu1804"

RSC_VERSION := "2023.01.0"
RSC_VERSION := "2023.01.1"
RSC_TAG_SAFE_VERSION := replace(RSC_VERSION, "+", "-")
RSC_LICENSE := ""

Expand Down
8 changes: 4 additions & 4 deletions connect-content-init/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

# Supported tags and respective Dockerfile links

* [`2023.01.0`, `bionic`, `ubuntu1804`, `bionic-2023.01.0`, `ubuntu1804-2023.01.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.bionic)
* [`jammy`, `ubuntu2204`, `jammy-2023.01.0`, `ubuntu2204-2023.01.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.jammy)
* [`2023.01.1`, `bionic`, `ubuntu1804`, `bionic-2023.01.1`, `ubuntu1804-2023.01.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.bionic)
* [`jammy`, `ubuntu2204`, `jammy-2023.01.1`, `ubuntu2204-2023.01.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.jammy)

# RStudio Connect Content Init Container

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

```console
just build ubuntu1804 2023.01.0
just build ubuntu1804 2023.01.1
```

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

```console
docker history rstudio/rstudio-connect-content-init-preview:2023.01.0-dev-326
docker history rstudio/rstudio-connect-content-init-preview:2023.01.1-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=2023.01.0
RSC_VERSION=2023.01.1
R_VERSION=3.6.2
R_VERSION_ALT=4.1.0
PYTHON_VERSION=3.9.5
Expand Down
2 changes: 1 addition & 1 deletion connect/Dockerfile.ubuntu1804
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ RUN curl -L -o /usr/local/bin/tini https://github.com/krallin/tini/releases/down
COPY --chmod=0775 startup.sh /usr/local/bin/startup.sh

# Download RStudio Connect -----------------------------------------------------#
ARG RSC_VERSION=2023.01.0
ARG RSC_VERSION=2023.01.1
SHELL [ "/bin/bash", "-o", "pipefail", "-c"]
RUN apt-get update --fix-missing \
&& RSC_VERSION_URL=$(echo -n "${RSC_VERSION}" | sed 's/+/%2B/g') \
Expand Down
2 changes: 1 addition & 1 deletion connect/Dockerfile.ubuntu2204
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ RUN curl -L -o /usr/local/bin/tini https://github.com/krallin/tini/releases/down
COPY --chmod=0775 startup.sh /usr/local/bin/startup.sh

# Download RStudio Connect -----------------------------------------------------#
ARG RSC_VERSION=2023.01.0
ARG RSC_VERSION=2023.01.1
SHELL [ "/bin/bash", "-o", "pipefail", "-c"]
RUN apt-get update --fix-missing \
&& RSC_VERSION_URL=$(echo -n "${RSC_VERSION}" | sed 's/+/%2B/g') \
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 := "ubuntu1804"

RSC_VERSION := "2023.01.0"
RSC_VERSION := "2023.01.1"
RSC_LICENSE := ""
RSC_LICENSE_SERVER := ""

Expand Down
4 changes: 2 additions & 2 deletions connect/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

# Supported tags and respective Dockerfile links

* [`2023.01.0`, `bionic`, `ubuntu1804`, `bionic-2023.01.0`, `ubuntu1804-2023.01.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.bionic)
* [`jammy`, `ubuntu2204`, `jammy-2023.01.0`, `ubuntu2204-2023.01.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.jammy)
* [`2023.01.1`, `bionic`, `ubuntu1804`, `bionic-2023.01.1`, `ubuntu1804-2023.01.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.bionic)
* [`jammy`, `ubuntu2204`, `jammy-2023.01.1`, `ubuntu2204-2023.01.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.jammy)

# What is RStudio 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: 2023.01.0
image: rstudio/rstudio-connect:2023.01.0
RSC_VERSION: 2023.01.1
image: rstudio/rstudio-connect:2023.01.1
privileged: true
environment:
RSC_LICENSE: ${RSC_LICENSE}
Expand Down

0 comments on commit ff278db

Please sign in to comment.