Skip to content

Commit ff278db

Browse files
authored
Merge pull request #473 from rstudio/chris-rsc-2023.01.1
Bump Connect to 2023.01.1
2 parents be52f60 + 6d311f2 commit ff278db

11 files changed

+16
-16
lines changed

Justfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" }
66

77
BUILDX_PATH := ""
88

9-
RSC_VERSION := "2023.01.0"
9+
RSC_VERSION := "2023.01.1"
1010
RSPM_VERSION := "2022.11.4-20"
1111
RSW_VERSION := "2022.12.0+353.pro20"
1212

connect-content-init/Dockerfile.ubuntu1804

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN apt-get update && \
1010
apt-get install -y --no-install-recommends ca-certificates curl && \
1111
rm -rf /var/lib/apt/lists/*
1212

13-
ARG RSC_VERSION=2023.01.0
13+
ARG RSC_VERSION=2023.01.1
1414
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1515
RUN mkdir -p /rsc-staging && \
1616
RSC_VERSION_URL=$(echo -n "${RSC_VERSION}" | sed 's/+/%2B/g') && \

connect-content-init/Dockerfile.ubuntu2204

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN apt-get update && \
1010
apt-get install -y --no-install-recommends ca-certificates curl && \
1111
rm -rf /var/lib/apt/lists/*
1212

13-
ARG RSC_VERSION=2023.01.0
13+
ARG RSC_VERSION=2023.01.1
1414
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1515
RUN mkdir -p /rsc-staging && \
1616
RSC_VERSION_URL=$(echo -n "${RSC_VERSION}" | sed 's/+/%2B/g') && \

connect-content-init/Justfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-"
66
PRODUCT := "connect-content-init"
77
IMAGE_OS := "ubuntu1804"
88

9-
RSC_VERSION := "2023.01.0"
9+
RSC_VERSION := "2023.01.1"
1010
RSC_TAG_SAFE_VERSION := replace(RSC_VERSION, "+", "-")
1111
RSC_LICENSE := ""
1212

connect-content-init/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
# Supported tags and respective Dockerfile links
1111

12-
* [`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)
13-
* [`jammy`, `ubuntu2204`, `jammy-2023.01.0`, `ubuntu2204-2023.01.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.jammy)
12+
* [`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)
13+
* [`jammy`, `ubuntu2204`, `jammy-2023.01.1`, `ubuntu2204-2023.01.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.jammy)
1414

1515
# RStudio Connect Content Init Container
1616

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

3434
```console
35-
just build ubuntu1804 2023.01.0
35+
just build ubuntu1804 2023.01.1
3636
```
3737

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

5959
```console
60-
docker history rstudio/rstudio-connect-content-init-preview:2023.01.0-dev-326
60+
docker history rstudio/rstudio-connect-content-init-preview:2023.01.1-dev-326
6161
```
6262

6363
NOTE: almost all the image size is pandoc.

connect/.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
RSC_VERSION=2023.01.0
1+
RSC_VERSION=2023.01.1
22
R_VERSION=3.6.2
33
R_VERSION_ALT=4.1.0
44
PYTHON_VERSION=3.9.5

connect/Dockerfile.ubuntu1804

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ RUN curl -L -o /usr/local/bin/tini https://github.com/krallin/tini/releases/down
101101
COPY --chmod=0775 startup.sh /usr/local/bin/startup.sh
102102

103103
# Download RStudio Connect -----------------------------------------------------#
104-
ARG RSC_VERSION=2023.01.0
104+
ARG RSC_VERSION=2023.01.1
105105
SHELL [ "/bin/bash", "-o", "pipefail", "-c"]
106106
RUN apt-get update --fix-missing \
107107
&& RSC_VERSION_URL=$(echo -n "${RSC_VERSION}" | sed 's/+/%2B/g') \

connect/Dockerfile.ubuntu2204

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ RUN curl -L -o /usr/local/bin/tini https://github.com/krallin/tini/releases/down
9898
COPY --chmod=0775 startup.sh /usr/local/bin/startup.sh
9999

100100
# Download RStudio Connect -----------------------------------------------------#
101-
ARG RSC_VERSION=2023.01.0
101+
ARG RSC_VERSION=2023.01.1
102102
SHELL [ "/bin/bash", "-o", "pipefail", "-c"]
103103
RUN apt-get update --fix-missing \
104104
&& RSC_VERSION_URL=$(echo -n "${RSC_VERSION}" | sed 's/+/%2B/g') \

connect/Justfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-"
66
PRODUCT := "connect"
77
IMAGE_OS := "ubuntu1804"
88

9-
RSC_VERSION := "2023.01.0"
9+
RSC_VERSION := "2023.01.1"
1010
RSC_LICENSE := ""
1111
RSC_LICENSE_SERVER := ""
1212

connect/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
# Supported tags and respective Dockerfile links
99

10-
* [`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)
11-
* [`jammy`, `ubuntu2204`, `jammy-2023.01.0`, `ubuntu2204-2023.01.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.jammy)
10+
* [`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)
11+
* [`jammy`, `ubuntu2204`, `jammy-2023.01.1`, `ubuntu2204-2023.01.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.jammy)
1212

1313
# What is RStudio Connect?
1414

docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ services:
2525
context: ./connect
2626
dockerfile: "Dockerfile.${IMAGE_OS:-ubuntu1804}"
2727
args:
28-
RSC_VERSION: 2023.01.0
29-
image: rstudio/rstudio-connect:2023.01.0
28+
RSC_VERSION: 2023.01.1
29+
image: rstudio/rstudio-connect:2023.01.1
3030
privileged: true
3131
environment:
3232
RSC_LICENSE: ${RSC_LICENSE}

0 commit comments

Comments
 (0)