Skip to content

Commit

Permalink
add Python to Package Manager images
Browse files Browse the repository at this point in the history
  • Loading branch information
shepherdjerred committed Nov 13, 2023
1 parent 5f47778 commit fd0af45
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 98 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build-prerelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ jobs:
- {product: "workbench", type: "preview", os: "ubuntu2204", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
- {product: "connect", type: "daily", os: "ubuntu2204", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
- {product: "connect-content-init", type: "daily", os: "ubuntu2204", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
- {product: "package-manager", type: "daily", os: "ubuntu1804", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
- {product: "package-manager", type: "daily", os: "ubuntu2204", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
- {product: "r-session-complete", type: "daily", os: "ubuntu2204", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
- {product: "r-session-complete", type: "daily", os: 'centos7', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.14", py-alternate: "3.8.15"}
Expand Down
2 changes: 2 additions & 0 deletions hadolint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ ignored:
- DL3008
# Suppresses warning for version pinning on yum installs. We currently do not practice this approach.
- DL3033
# Suppresses warning for version pinning on pip installs. We currently do not practice this approach.
- DL3013
# Suppresses info for too many consecutive RUN statements. Multiple consecutive RUN statements are often a conscious
# design choice in our Dockerfiles, but we could consider condensing them in the future.
- DL3059
Expand Down
94 changes: 0 additions & 94 deletions package-manager/Dockerfile.ubuntu1804

This file was deleted.

12 changes: 9 additions & 3 deletions package-manager/Dockerfile.ubuntu2204
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
ARG R_VERSION=4.2.3
FROM rstudio/r-base:${R_VERSION}-jammy
ARG R_VERSION_ALT=4.1.3
ARG PYTHON_VERSION=3.9.17
ARG PYTHON_VERSION_ALT=3.8.17
ARG SRC_IMAGE_NAME=product-base-pro
ARG REGISTRY=ghcr.io
FROM ${REGISTRY}/rstudio/${SRC_IMAGE_NAME}:ubuntu2204-r${R_VERSION}_${R_VERSION_ALT}-py${PYTHON_VERSION}_${PYTHON_VERSION_ALT}
LABEL maintainer="RStudio Docker <docker@rstudio.com>"

ARG R_VERSION=4.2.3

# Locale configuration --------------------------------------------------------#
RUN localedef -i en_US -f UTF-8 en_US.UTF-8
ENV LANG en_US.UTF-8
Expand All @@ -25,6 +28,9 @@ RUN apt-get update --fix-missing \
gpg-agent \
&& rm -rf /var/lib/apt/lists/*

# Required Python packages ----------------------------------------------------#
RUN pip3 install --no-cache-dir build virtualenv

# Runtime settings ------------------------------------------------------------#
ADD https://cdn.rstudio.com/platform/tini/v${TINI_VERSION}/tini-amd64 /tini
ADD https://cdn.rstudio.com/platform/tini/v${TINI_VERSION}/tini-amd64.asc /tini.asc
Expand Down

0 comments on commit fd0af45

Please sign in to comment.