Skip to content

Commit 1e72cc2

Browse files
bschwedlerbschwedler
authored
Merge pull request #6 from posit-dev/add-new-workbench-releases
Add Workbench 2024.12.0 and 2024.12.1 releases
2 parents a7ff244 + 20156a6 commit 1e72cc2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+90
-122
lines changed

‎workbench/2024.09.0+375.pro3/conf/rstudio/jupyter.conf‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎workbench/2024.09.0+375.pro3/conf/rstudio/launcher-env‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎workbench/2024.09.0+375.pro3/conf/rstudio/launcher.conf‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎workbench/2024.09.0+375.pro3/conf/rstudio/launcher.local.conf‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎workbench/2024.09.0+375.pro3/conf/rstudio/vscode-user-settings.json‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎workbench/2024.09.0+375.pro3/conf/rstudio/vscode.conf‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎workbench/2024.09.0+375.pro3/conf/rstudio/vscode.extensions.conf‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

workbench/2024.04.2+764.pro1/Containerfile.ubuntu2204.min renamed to workbench/2024.12.0+467.pro1/Containerfile.ubuntu2204.min

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ LABEL org.opencontainers.image.base.name="docker.io/library/ubuntu:22.04"
33

44
### ARG declarations ###
55
ARG DEBIAN_FRONTEND=noninteractive
6-
ARG PTI_VERSION="0.0.3"
6+
ARG PTI_VERSION="0.0.4"
77
ARG PTI_NO_COLOR="true"
88
ARG PTI_LOG_FORMAT="json"
99

10-
ARG WORKBENCH_VERSION="2024.04.2+764.pro1"
10+
ARG WORKBENCH_VERSION="2024.12.0+467.pro1"
1111
ARG RSTUDIO_INSTALL_NO_LICENSE_INITIALIZATION=1
1212

1313
ENV STARTUP_DEBUG_MODE 0
@@ -35,7 +35,7 @@ COPY --chmod=0755 ./tools/pti /usr/local/bin/pti
3535
RUN pti init
3636

3737
### Install System Packages ###
38-
COPY workbench/2024.04.2+764.pro1/deps/ubuntu2204_packages.txt /tmp/ubuntu2204_packages.txt
38+
COPY workbench/2024.12.0+467.pro1/deps/ubuntu2204_packages.txt /tmp/ubuntu2204_packages.txt
3939

4040
RUN pti syspkg update \
4141
&& pti syspkg upgrade --dist \
@@ -45,19 +45,19 @@ RUN pti syspkg update \
4545
### Install wait-for-it ###
4646
RUN pti container wait-for-it install
4747

48-
### Install Workbench 2024.04.2+764.pro1 ###
49-
COPY workbench/2024.04.2+764.pro1/scripts/install_workbench.sh /tmp/install_workbench.sh
48+
### Install Workbench 2024.12.0+467.pro1 ###
49+
COPY workbench/2024.12.0+467.pro1/scripts/install_workbench.sh /tmp/install_workbench.sh
5050
RUN OS_URL=jammy /tmp/install_workbench.sh
5151

5252
### Install Quarto to PATH ###
5353
RUN ln -s /lib/rstudio-server/bin/quarto/bin/quarto /usr/local/bin/quarto
5454

5555
### Copy startup scripts ###
56-
COPY --chmod=0775 "workbench/2024.04.2+764.pro1/scripts/startup.sh" /usr/local/bin/startup.sh
57-
COPY "workbench/2024.04.2+764.pro1/startup/launcher" /startup/launcher
58-
COPY "workbench/2024.04.2+764.pro1/startup/base" /startup/base
59-
COPY "workbench/2024.04.2+764.pro1/startup/supervisord.conf" /etc/supervisor/supervisord.conf
60-
COPY "workbench/2024.04.2+764.pro1/conf/jupyter/*" "workbench/2024.04.2+764.pro1/conf/launcher/*" "workbench/2024.04.2+764.pro1/conf/rstudio/*" "workbench/2024.04.2+764.pro1/conf/vscode/*" /etc/rstudio
56+
COPY --chmod=0775 "workbench/2024.12.0+467.pro1/scripts/startup.sh" /usr/local/bin/startup.sh
57+
COPY "workbench/2024.12.0+467.pro1/startup/launcher" /startup/launcher
58+
COPY "workbench/2024.12.0+467.pro1/startup/base" /startup/base
59+
COPY "workbench/2024.12.0+467.pro1/startup/supervisord.conf" /etc/supervisor/supervisord.conf
60+
COPY "workbench/2024.12.0+467.pro1/conf/jupyter/*" "workbench/2024.12.0+467.pro1/conf/launcher/*" "workbench/2024.12.0+467.pro1/conf/rstudio/*" "workbench/2024.12.0+467.pro1/conf/vscode/*" /etc/rstudio
6161

6262
### Configure Workbench ###
6363
RUN mkdir -p /var/lib/rstudio-server/monitor/log \

workbench/2024.04.2+764.pro1/Containerfile.ubuntu2204.std renamed to workbench/2024.12.0+467.pro1/Containerfile.ubuntu2204.std

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ LABEL org.opencontainers.image.base.name="docker.io/library/ubuntu:22.04"
33

44
### ARG declarations ###
55
ARG DEBIAN_FRONTEND=noninteractive
6-
ARG PTI_VERSION="0.0.3"
6+
ARG PTI_VERSION="0.0.4"
77
ARG PTI_NO_COLOR="true"
88
ARG PTI_LOG_FORMAT="json"
99

10-
ARG PYTHON_VERSION="3.12.1"
11-
ARG R_VERSION="4.4.0"
12-
ARG WORKBENCH_VERSION="2024.04.2+764.pro1"
10+
ARG PYTHON_VERSION="3.12.9"
11+
ARG R_VERSION="4.4.2"
12+
ARG WORKBENCH_VERSION="2024.12.0+467.pro1"
1313
ARG RSTUDIO_INSTALL_NO_LICENSE_INITIALIZATION=1
1414

1515
ENV STARTUP_DEBUG_MODE 0
@@ -37,8 +37,8 @@ COPY --chmod=0755 ./tools/pti /usr/local/bin/pti
3737
RUN pti init
3838

3939
### Install System Packages ###
40-
COPY workbench/2024.04.2+764.pro1/deps/ubuntu2204_packages.txt /tmp/ubuntu2204_packages.txt
41-
COPY workbench/2024.04.2+764.pro1/deps/ubuntu2204_optional_packages.txt /tmp/ubuntu2204_optional_packages.txt
40+
COPY workbench/2024.12.0+467.pro1/deps/ubuntu2204_packages.txt /tmp/ubuntu2204_packages.txt
41+
COPY workbench/2024.12.0+467.pro1/deps/ubuntu2204_optional_packages.txt /tmp/ubuntu2204_optional_packages.txt
4242
RUN pti syspkg update \
4343
&& pti syspkg upgrade --dist \
4444
&& pti syspkg install -f /tmp/ubuntu2204_packages.txt \
@@ -49,8 +49,8 @@ RUN pti syspkg update \
4949
### Install wait-for-it ###
5050
RUN pti container wait-for-it install
5151

52-
### Install Workbench 2024.04.2+764.pro1 ###
53-
COPY workbench/2024.04.2+764.pro1/scripts/install_workbench.sh /tmp/install_workbench.sh
52+
### Install Workbench 2024.12.0+467.pro1 ###
53+
COPY workbench/2024.12.0+467.pro1/scripts/install_workbench.sh /tmp/install_workbench.sh
5454
RUN OS_URL=jammy /tmp/install_workbench.sh
5555

5656
### Install Quarto to PATH ###
@@ -71,13 +71,13 @@ RUN pti python install --add-to-path --default "${PYTHON_VERSION}" \
7171
RUN pti pro-drivers install --copy-odbcinst
7272

7373
### Copy startup scripts ###
74-
COPY --chmod=0775 "workbench/2024.04.2+764.pro1/scripts/startup.sh" /usr/local/bin/startup.sh
75-
COPY "workbench/2024.04.2+764.pro1/startup/launcher" /startup/launcher
76-
COPY "workbench/2024.04.2+764.pro1/startup/base" /startup/base
77-
COPY "workbench/2024.04.2+764.pro1/startup/supervisord.conf" /etc/supervisor/supervisord.conf
78-
COPY "workbench/2024.04.2+764.pro1/startup/user-provisioning" /startup/user-provisioning
79-
COPY --chmod=600 "workbench/2024.04.2+764.pro1/conf/sssd/sssd.conf" /etc/sssd/sssd.conf
80-
COPY "workbench/2024.04.2+764.pro1/conf/jupyter/*" "workbench/2024.04.2+764.pro1/conf/launcher/*" "workbench/2024.04.2+764.pro1/conf/rstudio/*" "workbench/2024.04.2+764.pro1/conf/vscode/*" /etc/rstudio
74+
COPY --chmod=0775 "workbench/2024.12.0+467.pro1/scripts/startup.sh" /usr/local/bin/startup.sh
75+
COPY "workbench/2024.12.0+467.pro1/startup/launcher" /startup/launcher
76+
COPY "workbench/2024.12.0+467.pro1/startup/base" /startup/base
77+
COPY "workbench/2024.12.0+467.pro1/startup/supervisord.conf" /etc/supervisor/supervisord.conf
78+
COPY "workbench/2024.12.0+467.pro1/startup/user-provisioning" /startup/user-provisioning
79+
COPY --chmod=600 "workbench/2024.12.0+467.pro1/conf/sssd/sssd.conf" /etc/sssd/sssd.conf
80+
COPY "workbench/2024.12.0+467.pro1/conf/jupyter/*" "workbench/2024.12.0+467.pro1/conf/launcher/*" "workbench/2024.12.0+467.pro1/conf/rstudio/*" "workbench/2024.12.0+467.pro1/conf/vscode/*" /etc/rstudio
8181

8282
### Configure Workbench ###
8383
RUN mkdir -p /var/lib/rstudio-server/monitor/log \
@@ -86,8 +86,8 @@ RUN mkdir -p /var/lib/rstudio-server/monitor/log \
8686
&& printf '\n# allow home directory creation\nsession required pam_mkhomedir.so skel=/etc/skel umask=0077\n' >> /etc/pam.d/common-session \
8787
&& echo "RSPM=https://packagemanager.posit.co/cran/__linux__/jammy/latest" > /etc/rstudio/repos.conf \
8888
&& echo "CRAN=https://packagemanager.posit.co/cran/__linux__/jammy/latest" >> /etc/rstudio/repos.conf
89-
LABEL co.posit.image.tools.python="3.12.1" \
90-
co.posit.image.tools.r="4.4.0"
89+
LABEL co.posit.image.tools.python="3.12.9" \
90+
co.posit.image.tools.r="4.4.2"
9191

9292
EXPOSE 8787/tcp
9393
EXPOSE 5559/tcp

workbench/2024.04.2+764.pro1/conf/jupyter/jupyter.conf renamed to workbench/2024.12.0+467.pro1/conf/jupyter/jupyter.conf

File renamed without changes.

0 commit comments

Comments
 (0)