Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions bakery.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ images:
- name: Ubuntu 22.04
primary: true
versions:
- name: 2025.09.1+401.pro2
- name: 2025.09.2+418.pro4
subpath: '2025.09'
latest: true
os:
Expand Down Expand Up @@ -103,7 +103,7 @@ images:
values:
go_version: 1.25.3
versions:
- name: 2025.09.1+401.pro2
- name: 2025.09.2+418.pro4
subpath: '2025.09'
latest: true
os:
Expand Down
4 changes: 2 additions & 2 deletions workbench-session-init/2025.09/Containerfile.ubuntu2204
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM docker.io/library/golang:1.25.1 AS builder

ARG DEBIAN_FRONTEND=noninteractive
ARG WORKBENCH_VERSION="2025.09.1+401.pro2"
ARG WORKBENCH_VERSION="2025.09.2+418.pro4"

### Initialize PTI in container ###
RUN apt-get update -yqq --fix-missing && \
Expand All @@ -21,7 +21,7 @@ RUN apt-get update -yqq --fix-missing && \
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN mkdir -p /pwb-staging && \
WORKBENCH_VERSION_URL=$(echo -n "${WORKBENCH_VERSION}" | sed 's/+/-/g') && \
curl -fsSL -o /pwb-staging/rsp-session-multi-linux.tar.gz "https://s3.amazonaws.com/rstudio-ide-build/session/multi/x86_64/rsp-session-multi-linux-2025.09.1-401.pro2-x86_64.tar.gz" && \
curl -fsSL -o /pwb-staging/rsp-session-multi-linux.tar.gz "https://s3.amazonaws.com/rstudio-ide-build/session/multi/x86_64/rsp-session-multi-linux-2025.09.2-418.pro4-x86_64.tar.gz" && \
mkdir -p /opt/session-components && \
tar -C /opt/session-components -xpf /pwb-staging/rsp-session-multi-linux.tar.gz && \
chmod 755 /opt/session-components && \
Expand Down
8 changes: 8 additions & 0 deletions workbench-session-init/2025.09/entrypoint/go.sum
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
github.com/otiai10/copy v1.14.1 h1:5/7E6qsUMBaH5AnQ0sSLzzTg1oTECmcCmT6lvF45Na8=
github.com/otiai10/copy v1.14.1/go.mod h1:oQwrEDDOci3IM8dJF0d8+jnbfPDllW6vUjNc3DoZm9I=
github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=
github.com/otiai10/mint v1.5.1/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
github.com/otiai10/mint v1.6.3 h1:87qsV/aw1F5as1eH1zS/yqHY85ANKVMgkDrf9rcxbQs=
github.com/otiai10/mint v1.6.3/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
4 changes: 2 additions & 2 deletions workbench/2025.09/Containerfile.ubuntu2204.min
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ LABEL org.opencontainers.image.base.name="docker.io/library/ubuntu:22.04"

### ARG declarations ###
ARG DEBIAN_FRONTEND=noninteractive
ARG WORKBENCH_VERSION="2025.09.1+401.pro2"
ARG WORKBENCH_VERSION="2025.09.2+418.pro4"
ARG RSTUDIO_INSTALL_NO_LICENSE_INITIALIZATION=1

ENV STARTUP_DEBUG_MODE=0
Expand Down Expand Up @@ -43,7 +43,7 @@ RUN apt-get update -yqq && \
RUN curl -fsSL -o /usr/local/bin/wait-for-it.sh https://raw.githubusercontent.com/rstudio/wait-for-it/master/wait-for-it.sh && \
chmod +x /usr/local/bin/wait-for-it.sh

### Install Workbench 2025.09.1+401.pro2 ###
### Install Workbench 2025.09.2+418.pro4 ###
COPY --chmod=0755 workbench/2025.09/scripts/install_workbench.sh /tmp/install_workbench.sh
RUN \
/tmp/install_workbench.sh && \
Expand Down
4 changes: 2 additions & 2 deletions workbench/2025.09/Containerfile.ubuntu2204.std
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ LABEL org.opencontainers.image.base.name="docker.io/library/ubuntu:22.04"

### ARG declarations ###
ARG DEBIAN_FRONTEND=noninteractive
ARG WORKBENCH_VERSION="2025.09.1+401.pro2"
ARG WORKBENCH_VERSION="2025.09.2+418.pro4"
ARG RSTUDIO_INSTALL_NO_LICENSE_INITIALIZATION=1

ENV STARTUP_DEBUG_MODE=0
Expand Down Expand Up @@ -54,7 +54,7 @@ RUN apt-get update -yqq && \
RUN curl -fsSL -o /usr/local/bin/wait-for-it.sh https://raw.githubusercontent.com/rstudio/wait-for-it/master/wait-for-it.sh && \
chmod +x /usr/local/bin/wait-for-it.sh

### Install Workbench 2025.09.1+401.pro2 ###
### Install Workbench 2025.09.2+418.pro4 ###
COPY --chmod=0755 workbench/2025.09/scripts/install_workbench.sh /tmp/install_workbench.sh
RUN \
/tmp/install_workbench.sh && \
Expand Down
4 changes: 2 additions & 2 deletions workbench/2025.09/scripts/install_workbench.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ d="===="
# Update apt repositories
apt-get update -yq

echo "$d Install Posit Workbench 2025.09.1+401.pro2 $d"
echo "$d Install Posit Workbench 2025.09.2+418.pro4 $d"

RSTUDIO_INSTALL_NO_LICENSE_INITIALIZATION=1 apt-get install -yf rstudio-server=2025.09.1+401.pro2
RSTUDIO_INSTALL_NO_LICENSE_INITIALIZATION=1 apt-get install -yf rstudio-server=2025.09.2+418.pro4
apt-mark hold rstudio-server

# Clean up
Expand Down
4 changes: 2 additions & 2 deletions workbench/2025.09/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ file:
owner: rstudio-server
group: rstudio-server
# Check for code-server executable (path varies based on RStudio Workbench version)
{{ $version_split := split "." "2025.09.1+401.pro2" }}
{{ $version_split := split "." "2025.09.2+418.pro4" }}
{{ if or (ge ($version_split._0 | atoi) 2025) (and (ge ($version_split._0 | atoi) 2024) (ge ($version_split._1 | atoi) 7)) }}
/usr/lib/rstudio-server/bin/pwb-code-server/bin/code-server:
exists: true
Expand Down Expand Up @@ -142,7 +142,7 @@ command:
exec: /usr/lib/rstudio-server/bin/rstudio-server version
exit-status: 0
stdout:
- "2025.09.1+401.pro2 Workbench"
- "2025.09.2+418.pro4 Workbench"
"Verify Jupyter Notebook works":
exec: "echo '{ \"cells\": [], \"metadata\": {}, \"nbformat\": 4, \"nbformat_minor\": 2}' | /opt/python/jupyter/bin/jupyter nbconvert --to notebook --stdin --stdout"
timeout: 60000
Expand Down