Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Workbench 2022.07.4 backwards compatibility with r-session-complete Centos 7 #661

Closed
wants to merge 1 commit into from
Closed

Workbench 2022.07.4 backwards compatibility with r-session-complete Centos 7 #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions r-session-complete/Dockerfile.centos7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ RUN yum install -y subversion \
&& yum clean all \
&& rm -rf /var/lib/rstudio-server/r-versions

COPY maybe_install_vs_code.sh /tmp/maybe_install_vs_code.sh
RUN /tmp/maybe_install_vs_code.sh \
&& rm /tmp/maybe_install_vs_code.sh

RUN /opt/python/"${PYTHON_VERSION}"/bin/pip3 install \
jupyter \
jupyterlab=="${JUPYTERLAB_VERSION}" \
Expand Down
10 changes: 6 additions & 4 deletions r-session-complete/Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ PRODUCT := "r-session-complete"
IMAGE_OS := "ubuntu2204"

RSW_VERSION := "2023.09.1+494.pro2"
RSW_RELEASE_TYPE := "release"
RSW_LICENSE := ""

DRIVERS_VERSION := "2023.05.0"
Expand All @@ -15,11 +16,11 @@ DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"
R_VERSION := "4.2.3"
R_VERSION_ALT := "4.1.3"

PYTHON_VERSION := "3.9.14"
PYTHON_VERSION_ALT := "3.8.15"
PYTHON_VERSION := "3.9.17"
PYTHON_VERSION_ALT := "3.8.17"

_make-default-tag OS=IMAGE_OS:
echo "{{IMAGE_PREFIX}}{{PRODUCT}}:{{OS}}-$(just -f ../Justfile _get-tag-safe-version {{RSW_VERSION}})"
_make-default-tag OS=IMAGE_OS VERSION=RSW_VERSION:
echo "{{IMAGE_PREFIX}}{{PRODUCT}}:{{OS}}-$(just -f ../Justfile _get-tag-safe-version {{VERSION}})"

# Build r-session-complete image - just build ubuntu2204 2022.07.2+576.pro12 rstudio/r-session-complete:ubuntu2204-2022.07.2-576.pro12
build OS=IMAGE_OS VERSION=RSW_VERSION *TAGS="":
Expand Down Expand Up @@ -55,6 +56,7 @@ build OS=IMAGE_OS VERSION=RSW_VERSION *TAGS="":
--build-arg R_VERSION_ALT="{{ R_VERSION_ALT }}" \
--build-arg PYTHON_VERSION="{{ PYTHON_VERSION }}" \
--build-arg PYTHON_VERSION_ALT="{{ PYTHON_VERSION_ALT }}" \
--build-arg RSW_DOWNLOAD_URL="$(just -f ../ci.Justfile _get-rsw-download-url {{RSW_RELEASE_TYPE}} {{OS}})" \
--file=./Dockerfile.$(just -f ../Justfile _parse-os {{OS}}) .

# Test r-session-complete image - just test rstudio/r-session-complete:ubuntu2204-2022.07.2-576.pro12 2022.07.2+576.pro12
Expand Down
Loading