Skip to content

Commit 2988d13

Browse files
ianpittwoodianpittwood
authored
Merge pull request #839 from rstudio/dev
Merge dev to main
2 parents a0b4bc4 + 49a3855 commit 2988d13

37 files changed

+50
-49
lines changed

‎connect-content-init/test/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ else
1515
fi
1616

1717
# install goss to tmp location and make executable
18-
curl -sL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
18+
curl -fsSL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
1919
&& chmod +x /tmp/goss \
2020
&& GOSS=/tmp/goss
2121

‎connect/Dockerfile.ubuntu2204

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ SHELL [ "/bin/bash", "-o", "pipefail", "-c"]
1919

2020
### Install TensorFlow Serving ###
2121
RUN echo "deb [arch=amd64] http://storage.googleapis.com/tensorflow-serving-apt stable tensorflow-model-server tensorflow-model-server-universal" > /etc/apt/sources.list.d/tensorflow-serving.list && \
22-
curl https://storage.googleapis.com/tensorflow-serving-apt/tensorflow-serving.release.pub.gpg | apt-key add -
22+
curl -fsSL https://storage.googleapis.com/tensorflow-serving-apt/tensorflow-serving.release.pub.gpg | apt-key add -
2323
RUN apt-get update \
2424
&& apt-get install -yq --no-install-recommends \
2525
tensorflow-model-server-universal \
@@ -34,7 +34,7 @@ RUN apt-get update --fix-missing \
3434
libpam-sss \
3535
libglib2.0-0 \
3636
&& RSC_VERSION_URL=$(echo -n "${RSC_VERSION}" | sed 's/+/%2B/g') \
37-
&& curl -L -o rstudio-connect.deb "https://cdn.rstudio.com/connect/$(echo $RSC_VERSION | sed -r 's/([0-9]+\.[0-9]+).*/\1/')/rstudio-connect_${RSC_VERSION_URL}~ubuntu22_amd64.deb" \
37+
&& curl -fsSL -o rstudio-connect.deb "https://cdn.rstudio.com/connect/$(echo $RSC_VERSION | sed -r 's/([0-9]+\.[0-9]+).*/\1/')/rstudio-connect_${RSC_VERSION_URL}~ubuntu22_amd64.deb" \
3838
# Pre 7/25/23 packages
3939
&& gpg --keyserver keyserver.ubuntu.com --recv-keys 3F32EE77E331692F \
4040
# Post 7/25 packages

‎connect/test/goss.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,4 @@ command:
120120
title: quarto_tinytex_installed
121121
exit-status: 0
122122
stderr:
123-
- "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}\\.\\d{2}\\s+v\\d{4}\\.\\d{2}\\.\\d{2}/"
123+
- "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?/"

‎connect/test/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ GOSS_VERSION=${GOSS_VERSION:-0.4.6}
2424
GOSS_MAX_CONCURRENT=${GOSS_MAX_CONCURRENT:-50}
2525

2626
# install goss to tmp location and make executable
27-
curl -sL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
27+
curl -fsSL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
2828
&& chmod +x /tmp/goss \
2929
&& GOSS=/tmp/goss
3030

‎content/base/Dockerfile.ubuntu1804

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
7777
RUN apt-get update \
7878
&& apt-get install -y --no-install-recommends wget \
7979
&& rm -rf /var/lib/apt/lists/* \
80-
&& curl -sL "https://yihui.org/tinytex/install-bin-unix.sh" | sh \
80+
&& curl -fsSL "https://yihui.org/tinytex/install-bin-unix.sh" | sh \
8181
&& /root/.TinyTeX/bin/*/tlmgr path remove \
8282
&& mv /root/.TinyTeX/ /opt/TinyTeX \
8383
&& /opt/TinyTeX/bin/*/tlmgr option sys_bin /usr/local/bin \

‎content/base/Dockerfile.ubuntu2204

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
8686
RUN apt-get update \
8787
&& apt-get install -y --no-install-recommends wget \
8888
&& rm -rf /var/lib/apt/lists/* \
89-
&& curl -sL "https://yihui.org/tinytex/install-bin-unix.sh" | sh \
89+
&& curl -fsSL "https://yihui.org/tinytex/install-bin-unix.sh" | sh \
9090
&& /root/.TinyTeX/bin/*/tlmgr path remove \
9191
&& mv /root/.TinyTeX/ /opt/TinyTeX \
9292
&& /opt/TinyTeX/bin/*/tlmgr option sys_bin /usr/local/bin \
@@ -111,7 +111,7 @@ RUN curl -fsSL -O https://cdn.rstudio.com/r/${DISTRIBUTION}/pkgs/${R_INSTALLER}
111111

112112
# We are NOT linking one of these Python versions into the PATH.
113113

114-
RUN curl -O https://cdn.rstudio.com/python/${DISTRIBUTION}/pkgs/python-${PYTHON_VERSION}_1_amd64.deb \
114+
RUN curl -fsSL -O https://cdn.rstudio.com/python/${DISTRIBUTION}/pkgs/python-${PYTHON_VERSION}_1_amd64.deb \
115115
&& apt-get install -yq --no-install-recommends ./python-${PYTHON_VERSION}_1_amd64.deb \
116116
&& rm -rf python-${PYTHON_VERSION}_1_amd64.deb \
117117
&& /opt/python/${PYTHON_VERSION}/bin/python3 -m pip install --upgrade setuptools

‎content/base/maybe_install_quarto.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
if [[ `grep -oE bionic /etc/lsb-release` ]] && [[ `ls /opt/python/ | grep '3\.10\.'` ]] && [[ `ls /opt/R | grep '4\.1\.'` ]]; then
66
qver=${QUARTO_VERSION:-1.3.340}
77
echo '--> Installing Quarto'
8-
curl -L -o /quarto.deb https://github.com/quarto-dev/quarto-cli/releases/download/v${qver}/quarto-${qver}-linux-amd64.deb
8+
curl -fsSL -o /quarto.deb https://github.com/quarto-dev/quarto-cli/releases/download/v${qver}/quarto-${qver}-linux-amd64.deb
99
apt install /quarto.deb
1010
rm -f /quarto.deb
1111
fi
@@ -14,7 +14,7 @@ fi
1414
if [[ `grep -oE jammy /etc/lsb-release` ]]; then
1515
qver=${QUARTO_VERSION:-1.3.340}
1616
echo '--> Installing Quarto'
17-
curl -L -o /quarto.tar.gz "https://github.com/quarto-dev/quarto-cli/releases/download/v${qver}/quarto-${qver}-linux-amd64.tar.gz"
17+
curl -fsSL -o /quarto.tar.gz "https://github.com/quarto-dev/quarto-cli/releases/download/v${qver}/quarto-${qver}-linux-amd64.tar.gz"
1818
mkdir -p /opt/quarto/${qver}
1919
tar -zxvf quarto.tar.gz -C "/opt/quarto/${qver}" --strip-components=1
2020
rm -f /quarto.tar.gz

‎content/pro/Dockerfile.ubuntu1804

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN apt-get update -y \
99
&& apt-get install -y --no-install-recommends unixodbc unixodbc-dev \
1010
&& rm -rf /var/lib/apt/lists/*
1111

12-
RUN curl -O https://cdn.rstudio.com/drivers/7C152C12/installer/rstudio-drivers_${DRIVERS_VERSION}_amd64.deb \
12+
RUN curl -fsSL -O https://cdn.rstudio.com/drivers/7C152C12/installer/rstudio-drivers_${DRIVERS_VERSION}_amd64.deb \
1313
&& apt-get update \
1414
&& apt-get install -yq --no-install-recommends ./rstudio-drivers_${DRIVERS_VERSION}_amd64.deb \
1515
&& rm -rf /var/lib/apt/lists/* \

‎content/pro/Dockerfile.ubuntu2204

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN apt-get update -y \
99
&& apt-get install -y --no-install-recommends unixodbc unixodbc-dev \
1010
&& rm -rf /var/lib/apt/lists/*
1111

12-
RUN curl -O https://cdn.rstudio.com/drivers/7C152C12/installer/rstudio-drivers_${DRIVERS_VERSION}_amd64.deb \
12+
RUN curl -fsSL -O https://cdn.rstudio.com/drivers/7C152C12/installer/rstudio-drivers_${DRIVERS_VERSION}_amd64.deb \
1313
&& apt-get update \
1414
&& apt-get install -yq --no-install-recommends ./rstudio-drivers_${DRIVERS_VERSION}_amd64.deb \
1515
&& rm -rf /var/lib/apt/lists/* \

‎float/Dockerfile.ubuntu1804

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ RUN apt-get update \
1313

1414
# Runtime settings
1515
ARG TINI_VERSION=0.18.0
16-
RUN curl -L -o /usr/local/bin/tini https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini \
16+
RUN curl -fsSL -o /usr/local/bin/tini https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini \
1717
&& chmod +x /usr/local/bin/tini
1818

1919
# install license server binary
2020
ARG PRODUCT=rsp
2121
ARG VERSION=1.1.2
2222
ARG PORT=8989
23-
RUN curl -L -o "${PRODUCT}-license-server.deb" "https://s3.amazonaws.com/rstudio-license-server/${PRODUCT}-license-server-${VERSION}-x86_64.deb" \
23+
RUN curl -fsSL -o "${PRODUCT}-license-server.deb" "https://s3.amazonaws.com/rstudio-license-server/${PRODUCT}-license-server-${VERSION}-x86_64.deb" \
2424
&& gdebi -n ${PRODUCT}-license-server.deb \
2525
&& rm ${PRODUCT}-license-server.deb
2626

‎package-manager/Dockerfile.ubuntu2204

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN /opt/python/${PYTHON_VERSION_ALT}/bin/python3 -m pip install --no-cache-dir
1515
# Download RStudio Package Manager ---------------------------------------------#
1616
ARG RSPM_VERSION=2024.08.0-6
1717
ARG RSPM_DOWNLOAD_URL=https://cdn.rstudio.com/package-manager/deb/amd64
18-
RUN curl -O ${RSPM_DOWNLOAD_URL}/rstudio-pm_${RSPM_VERSION}_amd64.deb \
18+
RUN curl -fsSL -O ${RSPM_DOWNLOAD_URL}/rstudio-pm_${RSPM_VERSION}_amd64.deb \
1919
# Pre 7/25/23 packages
2020
&& gpg --keyserver keyserver.ubuntu.com --recv-keys 3F32EE77E331692F \
2121
# Post 7/25 packages

‎package-manager/test/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ else
2323
fi
2424

2525
# install goss to tmp location and make executable
26-
curl -sL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
26+
curl -fsSL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
2727
&& chmod +x /tmp/goss \
2828
&& GOSS=/tmp/goss
2929

‎product/base/Dockerfile.centos7

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RUN gpg --batch --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 595E85A6B1
2929

3030
### Install TinyTeX ###
3131
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
32-
RUN curl -sL "https://yihui.org/tinytex/install-bin-unix.sh" | sh \
32+
RUN curl -fsSL "https://yihui.org/tinytex/install-bin-unix.sh" | sh \
3333
&& /root/.TinyTeX/bin/*/tlmgr path remove \
3434
&& mv /root/.TinyTeX/ /opt/TinyTeX \
3535
&& /opt/TinyTeX/bin/*/tlmgr option sys_bin /usr/local/bin \

‎product/base/scripts/rhel/install_drivers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fi
1313
echo "$d$d Installing Professional Drivers ${DRIVERS_VERSION} $d$d"
1414

1515
drivers_url="https://cdn.rstudio.com/drivers/7C152C12/installer/rstudio-drivers-${DRIVERS_VERSION}.el.x86_64.rpm"
16-
curl -sL "$drivers_url" -o "/tmp/rstudio-drivers_${DRIVERS_VERSION}.el.x86_64.rpm"
16+
curl -fsSL "$drivers_url" -o "/tmp/rstudio-drivers_${DRIVERS_VERSION}.el.x86_64.rpm"
1717

1818
yum install -y -q "/tmp/rstudio-drivers_${DRIVERS_VERSION}.el.x86_64.rpm"
1919
cat /opt/rstudio-drivers/odbcinst.ini.sample > /etc/odbcinst.ini

‎product/base/scripts/rhel/install_python.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ install_python() {
9292
mkdir -p "$PREFIX"
9393

9494
local python_url="https://cdn.rstudio.com/python/${DISTRO}-${OS_VERSION}/pkgs/python-${PYTHON_VERSION}-1-1.x86_64.rpm"
95-
curl -sL "$python_url" -o "/tmp/python-${PYTHON_VERSION}.rpm"
95+
curl -fsSL "$python_url" -o "/tmp/python-${PYTHON_VERSION}.rpm"
9696

9797
# shellcheck disable=SC2086
9898
yum install $YUM_ARGS "/tmp/python-${PYTHON_VERSION}.rpm"

‎product/base/scripts/rhel/install_r.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ install_r() {
9898
mkdir -p "$PREFIX"
9999

100100
local r_url="https://cdn.rstudio.com/r/${DISTRO}-${OS_VERSION}/pkgs/R-${R_VERSION}-1-1.x86_64.rpm"
101-
curl -sL "$r_url" -o "/tmp/r-${R_VERSION}.rpm"
101+
curl -fsSL "$r_url" -o "/tmp/r-${R_VERSION}.rpm"
102102

103103
# shellcheck disable=SC2086
104104
yum install $YUM_ARGS "/tmp/r-${R_VERSION}.rpm"
@@ -146,7 +146,7 @@ get_r_source() {
146146
echo "$d Fetching R-${R_VERSION} source code into $r_source_dir $d"
147147
mkdir -p "$r_source_dir"
148148

149-
curl -sL "$r_source_url" -o "$r_source_dir/R-${R_VERSION}.tar.gz"
149+
curl -fsSL "$r_source_url" -o "$r_source_dir/R-${R_VERSION}.tar.gz"
150150
}
151151

152152

‎product/base/scripts/ubuntu/install_drivers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fi
1313
echo "$d$d Installing Professional Drivers ${DRIVERS_VERSION} $d$d"
1414

1515
drivers_url="https://cdn.rstudio.com/drivers/7C152C12/installer/rstudio-drivers_${DRIVERS_VERSION}_amd64.deb"
16-
curl -sL "$drivers_url" -o "/tmp/rstudio-drivers_${DRIVERS_VERSION}_amd64.deb"
16+
curl -fsSL "$drivers_url" -o "/tmp/rstudio-drivers_${DRIVERS_VERSION}_amd64.deb"
1717

1818
apt-get install -y -qq "/tmp/rstudio-drivers_${DRIVERS_VERSION}_amd64.deb"
1919
cat /opt/rstudio-drivers/odbcinst.ini.sample > /etc/odbcinst.ini

‎product/base/scripts/ubuntu/install_python.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ install_python() {
8888
mkdir -p "$PREFIX"
8989

9090
local python_url="https://cdn.rstudio.com/python/ubuntu-${UBUNTU_VERSION//./}/pkgs/python-${PYTHON_VERSION}_1_amd64.deb"
91-
curl -sL "$python_url" -o "/tmp/python-${PYTHON_VERSION}.deb"
91+
curl -fsSL "$python_url" -o "/tmp/python-${PYTHON_VERSION}.deb"
9292

9393
# shellcheck disable=SC2086
9494
apt-get install $APT_ARGS "/tmp/python-${PYTHON_VERSION}.deb"

‎product/base/scripts/ubuntu/install_quarto.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ install_quarto() {
101101
fi
102102

103103
mkdir -p "/opt/quarto/${QUARTO_VERSION}"
104-
wget -q -O - "https://github.com/quarto-dev/quarto-cli/releases/download/v${QUARTO_VERSION}/quarto-${QUARTO_VERSION}-linux-amd64.tar.gz" | tar xzf - -C "/opt/quarto/${QUARTO_VERSION}" --strip-components=1
104+
curl -fsSL "https://github.com/quarto-dev/quarto-cli/releases/download/v${QUARTO_VERSION}/quarto-${QUARTO_VERSION}-linux-amd64.tar.gz" | tar xzf - -C "/opt/quarto/${QUARTO_VERSION}" --strip-components=1
105105
}
106106

107107
update_tinytex() {

‎product/base/scripts/ubuntu/install_r.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ install_r() {
122122
mkdir -p "$PREFIX"
123123

124124
local r_url="https://cdn.rstudio.com/r/ubuntu-${UBUNTU_VERSION//./}/pkgs/r-${R_VERSION}_1_amd64.deb"
125-
curl -sL "$r_url" -o "/tmp/r-${R_VERSION}.deb"
125+
curl -fsSL "$r_url" -o "/tmp/r-${R_VERSION}.deb"
126126

127127
# shellcheck disable=SC2086
128128
apt-get install $APT_ARGS "/tmp/r-${R_VERSION}.deb"
@@ -152,7 +152,7 @@ get_r_source() {
152152
echo "$d Fetching R-${R_VERSION} source code into $r_source_dir $d"
153153
mkdir -p "$r_source_dir"
154154

155-
curl -sL "$r_source_url" -o "$r_source_dir/R-${R_VERSION}.tar.gz"
155+
curl -fsSL "$r_source_url" -o "$r_source_dir/R-${R_VERSION}.tar.gz"
156156
}
157157

158158

‎product/base/test/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ else
1919
fi
2020

2121
# install goss to tmp location and make executable
22-
curl -sL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
22+
curl -fsSL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
2323
&& chmod +x /tmp/goss \
2424
&& GOSS=/tmp/goss
2525

‎product/pro/test/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ else
1919
fi
2020

2121
# install goss to tmp location and make executable
22-
curl -sL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
22+
curl -fsSL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
2323
&& chmod +x /tmp/goss \
2424
&& GOSS=/tmp/goss
2525

‎r-session-complete/Dockerfile.ubuntu2204

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN apt-get update \
2424
rrdtool \
2525
subversion \
2626
&& RSW_VERSION_URL=$(echo -n "${RSW_VERSION}" | sed 's/+/-/g') \
27-
&& curl -o rstudio-workbench.deb "${RSW_DOWNLOAD_URL}/${RSW_NAME}-${RSW_VERSION_URL}-amd64.deb" \
27+
&& curl -fsSL -o rstudio-workbench.deb "${RSW_DOWNLOAD_URL}/${RSW_NAME}-${RSW_VERSION_URL}-amd64.deb" \
2828
# Pre 7/25/23 packages
2929
&& gpg --keyserver keyserver.ubuntu.com --recv-keys 3F32EE77E331692F \
3030
# Post 7/25 packages

‎r-session-complete/test/goss.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ command:
6666
title: quarto_tinytex_installed
6767
exit-status: 0
6868
stderr:
69-
- "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}\\.\\d{2}\\s+v\\d{4}\\.\\d{2}\\.\\d{2}/"
69+
- "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?/"

‎r-session-complete/test/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ else
1212
fi
1313

1414
# install goss to tmp location and make executable
15-
curl -sL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
15+
curl -fsSL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
1616
&& chmod +x /tmp/goss \
1717
&& GOSS=/tmp/goss
1818

‎r-session-complete/vscode.extensions.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
quarto.quarto
22
[email protected]
3-
ms-python.python@2023.6.1
3+
ms-python.python
44
posit.shiny
5+
ms-toolsai.jupyter

‎tools/get-version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def download_json(url):
108108

109109

110110
def get_downloads_json():
111-
return download_json("https://www.rstudio.com/wp-content/downloads.json")
111+
return download_json("https://posit.co/wp-content/uploads/downloads.json")
112112

113113

114114
def rstudio_workbench_preview():

‎workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM product-base-pro as posit_base
2-
FROM us-central1-docker.pkg.dev/cloud-workstations-images/predefined/base:latest as build
2+
FROM us-central1-docker.pkg.dev/cloud-workstations-images/predefined/base:last-ubuntu2204 as build
33

44
### ARG declarations ###
55
ARG DEBIAN_FRONTEND=noninteractive
@@ -37,7 +37,7 @@ COPY deps/* /tmp/
3737

3838
### Update/upgrade system packages ###
3939
COPY deps/apt_packages.txt /tmp/apt_packages.txt
40-
RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \
40+
RUN curl -fsSL https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \
4141
&& ${SCRIPTS_DIR}/apt.sh --update upgrade \
4242
&& ${SCRIPTS_DIR}/apt.sh install $(cat /tmp/apt_packages.txt) \
4343
&& ${SCRIPTS_DIR}/apt.sh --clean \
@@ -79,7 +79,7 @@ RUN ${SCRIPTS_DIR}/apt.sh --update upgrade \
7979

8080
### Install Workbench ###
8181
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
82-
RUN curl -o rstudio-workbench.deb "${RSW_DOWNLOAD_URL}/${RSW_NAME}-${RSW_VERSION//+/-}-amd64.deb" \
82+
RUN curl -fsSL -o rstudio-workbench.deb "${RSW_DOWNLOAD_URL}/${RSW_NAME}-${RSW_VERSION//+/-}-amd64.deb" \
8383
# Pre 7/25/23 packages
8484
&& gpg --keyserver keyserver.ubuntu.com --recv-keys 3F32EE77E331692F \
8585
# Post 7/25 packages
@@ -110,7 +110,7 @@ RUN rm -f /etc/rstudio/launcher.pem /etc/rstudio/launcher.pub
110110
# TODO(ianpittwood): Replace monitor download with $RSW_VERSION after upgrading to 2023.06.0
111111
RUN mkdir -p /opt/rstudio-license/ \
112112
&& mkdir -p /var/lib/rstudio-workbench \
113-
&& curl -sL "https://s3.amazonaws.com/rstudio-ide-build/monitor/jammy/rsp-monitor-workbench-gcpw-amd64-${RSW_VERSION//+/-}.tar.gz" | \
113+
&& curl -fsSL "https://s3.amazonaws.com/rstudio-ide-build/monitor/jammy/rsp-monitor-workbench-gcpw-amd64-${RSW_VERSION//+/-}.tar.gz" | \
114114
tar xzvf - --strip 2 -C /opt/rstudio-license/ \
115115
&& chmod 0755 /opt/rstudio-license/license-manager \
116116
&& mv /opt/rstudio-license/license-manager /opt/rstudio-license/license-manager-orig \

‎workbench-for-google-cloud-workstations/test/goss.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,4 +239,4 @@ command:
239239
title: quarto_tinytex_installed
240240
exit-status: 0
241241
stderr:
242-
- "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}\\.\\d{2}\\s+v\\d{4}\\.\\d{2}\\.\\d{2}/"
242+
- "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?/"

‎workbench-for-google-cloud-workstations/test/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ GOSS_VERSION=${GOSS_VERSION:-0.4.6}
3030
GOSS_MAX_CONCURRENT=${GOSS_MAX_CONCURRENT:-5}
3131

3232
# install goss to tmp location and make executable
33-
curl -sL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
33+
curl -fsSL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
3434
&& chmod +x /tmp/goss \
3535
&& GOSS=/tmp/goss
3636

‎workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ RUN apt-get update --fix-missing \
3939
&& rm -rf /var/lib/apt/lists/*
4040

4141
RUN apt-get update \
42-
&& curl -o rstudio-workbench.deb "${RSW_DOWNLOAD_URL}/${RSW_NAME}-${RSW_VERSION//+/-}-amd64.deb" \
42+
&& curl -fsSL -o rstudio-workbench.deb "${RSW_DOWNLOAD_URL}/${RSW_NAME}-${RSW_VERSION//+/-}-amd64.deb" \
4343
# Pre 7/25/23 packages
4444
&& gpg --keyserver keyserver.ubuntu.com --recv-keys 3F32EE77E331692F \
4545
# Post 7/25 packages
@@ -51,7 +51,7 @@ RUN apt-get update \
5151
&& rm ./rstudio-workbench.deb \
5252
&& mkdir -p /opt/rstudio-license/ \
5353
&& mkdir -p /var/lib/rstudio-workbench/ \
54-
&& curl -sL "https://s3.amazonaws.com/rstudio-ide-build/monitor/jammy/rsp-monitor-workbench-azureml-amd64-${RSW_VERSION//+/-}.tar.gz" \
54+
&& curl -fsSL "https://s3.amazonaws.com/rstudio-ide-build/monitor/jammy/rsp-monitor-workbench-azureml-amd64-${RSW_VERSION//+/-}.tar.gz" \
5555
| tar xzvf - --strip 2 -C /opt/rstudio-license/ \
5656
&& chmod 0755 /opt/rstudio-license/license-manager \
5757
&& mv /opt/rstudio-license/license-manager /opt/rstudio-license/license-manager-orig \
@@ -122,7 +122,7 @@ RUN /opt/python/${PYTHON_VERSION}/bin/python3 -m pip install -r /tmp/py_packages
122122

123123
ADD --chmod=755 https://raw.githubusercontent.com/rstudio/wait-for-it/master/wait-for-it.sh /usr/local/bin/wait-for-it.sh
124124

125-
RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash \
125+
RUN curl -fsSL https://aka.ms/InstallAzureCLIDeb | bash \
126126
&& az extension add -n ml -y
127127

128128
COPY conf/* /etc/rstudio/

‎workbench-for-microsoft-azure-ml/deps/install-r.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ install_r_packages() {
3131

3232
for rvers in 4.0.5 4.1.3 4.2.3 4.3.2; do
3333
# install r version
34-
curl -O https://cdn.rstudio.com/r/ubuntu-$(lsb_release -rs | sed 's/\.//g')/pkgs/r-${rvers}_1_amd64.deb
34+
curl -fsSL -O https://cdn.rstudio.com/r/ubuntu-$(lsb_release -rs | sed 's/\.//g')/pkgs/r-${rvers}_1_amd64.deb
3535
DEBIAN_FRONTEND=noninteractive apt-get install -y ./r-${rvers}_1_amd64.deb
3636
rm -f ./r-${rvers}_1_amd64.deb
3737

‎workbench-for-microsoft-azure-ml/test/goss.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,4 +157,4 @@ command:
157157
title: quarto_tinytex_installed
158158
exit-status: 0
159159
stderr:
160-
- "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}\\.\\d{2}\\s+v\\d{4}\\.\\d{2}\\.\\d{2}/"
160+
- "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?/"

‎workbench-for-microsoft-azure-ml/test/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ GOSS_VERSION=${GOSS_VERSION:-0.4.6}
3131
GOSS_MAX_CONCURRENT=${GOSS_MAX_CONCURRENT:-5}
3232

3333
# install goss to tmp location and make executable
34-
curl -sL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
34+
curl -fsSL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
3535
&& chmod +x /tmp/goss \
3636
&& GOSS=/tmp/goss
3737

0 commit comments

Comments
 (0)