From 47e08d52a103d8e381a5a9b786094e86ae251b9d Mon Sep 17 00:00:00 2001 From: Zach Hannum Date: Thu, 19 Oct 2023 09:42:48 -0400 Subject: [PATCH 1/5] Bump Workbench and rsession images to 2023.09.1 --- Justfile | 2 +- docker-compose.yml | 4 ++-- r-session-complete/.env | 2 +- r-session-complete/Dockerfile.centos7 | 2 +- r-session-complete/Dockerfile.ubuntu2204 | 2 +- r-session-complete/Justfile | 2 +- r-session-complete/README.md | 2 +- workbench-for-microsoft-azure-ml/.env | 2 +- workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 | 2 +- workbench-for-microsoft-azure-ml/Justfile | 2 +- workbench/.env | 2 +- workbench/Dockerfile.ubuntu2204 | 2 +- workbench/Justfile | 2 +- workbench/README.md | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Justfile b/Justfile index 004ad006..cd052445 100644 --- a/Justfile +++ b/Justfile @@ -8,7 +8,7 @@ BUILDX_PATH := "" RSC_VERSION := "2023.09.0" RSPM_VERSION := "2023.08.0-16" -RSW_VERSION := "2023.09.0+463.pro11" +RSW_VERSION := "2023.09.1+494.pro2" DRIVERS_VERSION := "2023.05.0" DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1" diff --git a/docker-compose.yml b/docker-compose.yml index e379b7ec..5ab39b04 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,8 +7,8 @@ services: context: ./workbench dockerfile: "Dockerfile.${IMAGE_OS:-ubuntu2204}" args: - RSW_VERSION: 2023.09.0+463.pro11 - image: rstudio/rstudio-workbench:2023.09.0 + RSW_VERSION: 2023.09.1+494.pro2 + image: rstudio/rstudio-workbench:2023.09.1 environment: RSW_LICENSE: ${RSW_LICENSE} LICENSE_SERVER: ${RSW_LICENSE_SERVER} diff --git a/r-session-complete/.env b/r-session-complete/.env index 3109aada..3dcca625 100644 --- a/r-session-complete/.env +++ b/r-session-complete/.env @@ -1,4 +1,4 @@ R_VERSION=4.1.0 PYTHON_VERSION=3.9.5 DRIVERS_VERSION=2023.05.0-1 -RSW_VERSION=2023.09.0+463.pro11 +RSW_VERSION=2023.09.1+494.pro2 diff --git a/r-session-complete/Dockerfile.centos7 b/r-session-complete/Dockerfile.centos7 index a3456ed0..37935d32 100644 --- a/r-session-complete/Dockerfile.centos7 +++ b/r-session-complete/Dockerfile.centos7 @@ -12,7 +12,7 @@ ARG R_VERSION_ALT=4.1.3 ARG PYTHON_VERSION=3.9.14 ARG PYTHON_VERSION_ALT=3.8.15 ARG JUPYTERLAB_VERSION=3.2.9 -ARG RSW_VERSION=2023.09.0+463.pro11 +ARG RSW_VERSION=2023.09.1+494.pro2 ARG RSW_NAME=rstudio-workbench-rhel ARG RSW_DOWNLOAD_URL=https://s3.amazonaws.com/rstudio-ide-build/server/centos7/x86_64 diff --git a/r-session-complete/Dockerfile.ubuntu2204 b/r-session-complete/Dockerfile.ubuntu2204 index d4a97571..e992844b 100644 --- a/r-session-complete/Dockerfile.ubuntu2204 +++ b/r-session-complete/Dockerfile.ubuntu2204 @@ -13,7 +13,7 @@ ARG R_VERSION_ALT=4.1.3 ARG PYTHON_VERSION=3.9.17 ARG PYTHON_VERSION_ALT=3.8.17 ARG JUPYTERLAB_VERSION=3.6.5 -ARG RSW_VERSION=2023.09.0+463.pro11 +ARG RSW_VERSION=2023.09.1+494.pro2 ARG RSW_NAME=rstudio-workbench ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64 diff --git a/r-session-complete/Justfile b/r-session-complete/Justfile index c03175d2..c58b0cae 100755 --- a/r-session-complete/Justfile +++ b/r-session-complete/Justfile @@ -6,7 +6,7 @@ IMAGE_PREFIX := "" PRODUCT := "r-session-complete" IMAGE_OS := "ubuntu2204" -RSW_VERSION := "2023.09.0+463.pro11" +RSW_VERSION := "2023.09.1+494.pro2" RSW_LICENSE := "" DRIVERS_VERSION := "2023.05.0" diff --git a/r-session-complete/README.md b/r-session-complete/README.md index 2c41eae3..d33bcca5 100644 --- a/r-session-complete/README.md +++ b/r-session-complete/README.md @@ -7,7 +7,7 @@ # Supported tags and respective Dockerfile links -* [`jammy`, `ubuntu2204`, `jammy-2023.09.0`, `ubuntu2204-2023.09.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204) +* [`jammy`, `ubuntu2204`, `jammy-2023.09.1`, `ubuntu2204-2023.09.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204) # What are the r-session-complete images? diff --git a/workbench-for-microsoft-azure-ml/.env b/workbench-for-microsoft-azure-ml/.env index 71982d9f..b2f9743b 100644 --- a/workbench-for-microsoft-azure-ml/.env +++ b/workbench-for-microsoft-azure-ml/.env @@ -1,4 +1,4 @@ -RSW_VERSION=2023.09.0+463.pro11 +RSW_VERSION=2023.09.1+494.pro2 RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/bionic/amd64 RSW_NAME=rstudio-workbench PYTHON_VERSION=3.9.14 diff --git a/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 b/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 index ac03929a..983e74aa 100644 --- a/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 +++ b/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 @@ -14,7 +14,7 @@ ARG PYTHON_VERSION=3.9.17 ARG PYTHON_VERSION_ALT=3.8.17 ARG PYTHON_VERSION_JUPYTER=3.8.17 ARG JUPYTERLAB_VERSION=3.6.5 -ARG RSW_VERSION=2023.09.0+463.pro11 +ARG RSW_VERSION=2023.09.1+494.pro2 ARG RSW_NAME=rstudio-workbench ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64 ARG DEBIAN_FRONTEND=noninteractive diff --git a/workbench-for-microsoft-azure-ml/Justfile b/workbench-for-microsoft-azure-ml/Justfile index d3d0dbd7..b2320fed 100644 --- a/workbench-for-microsoft-azure-ml/Justfile +++ b/workbench-for-microsoft-azure-ml/Justfile @@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-" PRODUCT := "workbench" IMAGE_OS := "ubuntu2204" -RSW_VERSION := "2023.09.0+463.pro11" +RSW_VERSION := "2023.09.1+494.pro2" RSW_LICENSE := "" R_VERSION := "4.2.3" diff --git a/workbench/.env b/workbench/.env index ae460ca1..5fd83596 100644 --- a/workbench/.env +++ b/workbench/.env @@ -1,4 +1,4 @@ -RSW_VERSION=2023.09.0+463.pro11 +RSW_VERSION=2023.09.1+494.pro2 RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/bionic/amd64 RSW_NAME=rstudio-workbench PYTHON_VERSION=3.9.17 diff --git a/workbench/Dockerfile.ubuntu2204 b/workbench/Dockerfile.ubuntu2204 index 972e88d2..5446fdb1 100644 --- a/workbench/Dockerfile.ubuntu2204 +++ b/workbench/Dockerfile.ubuntu2204 @@ -14,7 +14,7 @@ ARG PYTHON_VERSION=3.9.17 ARG PYTHON_VERSION_ALT=3.8.17 ARG PYTHON_VERSION_JUPYTER=3.8.17 ARG JUPYTERLAB_VERSION=3.6.5 -ARG RSW_VERSION=2023.09.0+463.pro11 +ARG RSW_VERSION=2023.09.1+494.pro2 ARG RSW_NAME=rstudio-workbench ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64 diff --git a/workbench/Justfile b/workbench/Justfile index 5ac7497b..392f823f 100644 --- a/workbench/Justfile +++ b/workbench/Justfile @@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-" PRODUCT := "workbench" IMAGE_OS := "ubuntu2204" -RSW_VERSION := "2023.09.0+463.pro11" +RSW_VERSION := "2023.09.1+494.pro2" RSW_LICENSE := "" RSW_LICENSE_SERVER := "" diff --git a/workbench/README.md b/workbench/README.md index 3cfa43f6..c6e22c65 100644 --- a/workbench/README.md +++ b/workbench/README.md @@ -7,7 +7,7 @@ # Supported tags and respective Dockerfile links -* [`jammy`, `ubuntu2204`, `jammy-2023.09.0`, `ubuntu2204-2023.09.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204) +* [`jammy`, `ubuntu2204`, `jammy-2023.09.1`, `ubuntu2204-2023.09.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204) # What is RStudio Workbench? From cd10a578a97842fc58f04e3cb6546a0e08ff3d62 Mon Sep 17 00:00:00 2001 From: Ian Pittwood Date: Thu, 19 Oct 2023 10:54:15 -0700 Subject: [PATCH 2/5] Use GHA expression to check if JSON string empty --- .github/actions/build-test-scan-push/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-test-scan-push/action.yaml b/.github/actions/build-test-scan-push/action.yaml index d0ff8544..5764543b 100644 --- a/.github/actions/build-test-scan-push/action.yaml +++ b/.github/actions/build-test-scan-push/action.yaml @@ -84,7 +84,7 @@ runs: - name: Authenticate GCAR shell: bash run: | - if [ ! -z "${{ inputs.gcp-json }}" ]; then + if [[ '${{ inputs.gcp-json != "" }}' == "true" ]]; then gcloud auth configure-docker -q us-central1-docker.pkg.dev gcloud auth configure-docker -q us-docker.pkg.dev gcloud auth configure-docker -q asia-docker.pkg.dev From 90b26430ee5d5a10a127b0b76d4b4066984d323a Mon Sep 17 00:00:00 2001 From: Ian Pittwood Date: Thu, 19 Oct 2023 10:58:07 -0700 Subject: [PATCH 3/5] Add `set -e` --- .github/actions/build-test-scan-push/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/build-test-scan-push/action.yaml b/.github/actions/build-test-scan-push/action.yaml index 5764543b..7d5df020 100644 --- a/.github/actions/build-test-scan-push/action.yaml +++ b/.github/actions/build-test-scan-push/action.yaml @@ -84,6 +84,7 @@ runs: - name: Authenticate GCAR shell: bash run: | + set -e if [[ '${{ inputs.gcp-json != "" }}' == "true" ]]; then gcloud auth configure-docker -q us-central1-docker.pkg.dev gcloud auth configure-docker -q us-docker.pkg.dev From 9f20d4d5195907f3c141b470092a6d38dc67b180 Mon Sep 17 00:00:00 2001 From: Ian Pittwood Date: Thu, 19 Oct 2023 10:59:34 -0700 Subject: [PATCH 4/5] Add `set -e` and wrap logic --- .github/actions/build-test-scan-push/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-test-scan-push/action.yaml b/.github/actions/build-test-scan-push/action.yaml index 7d5df020..b8fac49e 100644 --- a/.github/actions/build-test-scan-push/action.yaml +++ b/.github/actions/build-test-scan-push/action.yaml @@ -85,7 +85,7 @@ runs: shell: bash run: | set -e - if [[ '${{ inputs.gcp-json != "" }}' == "true" ]]; then + if [[ '${{ (inputs.gcp-json != "") }}' == "true" ]]; then gcloud auth configure-docker -q us-central1-docker.pkg.dev gcloud auth configure-docker -q us-docker.pkg.dev gcloud auth configure-docker -q asia-docker.pkg.dev From fa8f33991161ac5b5858b85041437dfdf4661cf7 Mon Sep 17 00:00:00 2001 From: Ian Pittwood Date: Thu, 19 Oct 2023 11:01:15 -0700 Subject: [PATCH 5/5] Swap quote style --- .github/actions/build-test-scan-push/action.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/build-test-scan-push/action.yaml b/.github/actions/build-test-scan-push/action.yaml index b8fac49e..6e120ff2 100644 --- a/.github/actions/build-test-scan-push/action.yaml +++ b/.github/actions/build-test-scan-push/action.yaml @@ -84,8 +84,7 @@ runs: - name: Authenticate GCAR shell: bash run: | - set -e - if [[ '${{ (inputs.gcp-json != "") }}' == "true" ]]; then + if [[ "${{ inputs.gcp-json != '' }}" == "true" ]]; then gcloud auth configure-docker -q us-central1-docker.pkg.dev gcloud auth configure-docker -q us-docker.pkg.dev gcloud auth configure-docker -q asia-docker.pkg.dev