Skip to content

Commit

Permalink
Merge branch 'dev' into connect-2024.09.0-docker-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ianpittwood authored Oct 1, 2024
2 parents 26291b5 + cc538f4 commit 9c8d1c8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# format per https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#about-code-owners
* @colearendt @ianpittwood @bschwedler @costrouc
* @ianpittwood @bschwedler @costrouc

/connect/* @rstudio/connect
/connect-content-init/* @rstudio/connect
Expand Down
12 changes: 8 additions & 4 deletions package-manager/Dockerfile.ubuntu2204
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,19 @@ ARG PYTHON_VERSION=3.9.17
ARG PYTHON_VERSION_ALT=3.8.17

# Locale configuration --------------------------------------------------------#
ENV STARTUP_DEBUG_MODE 0
ENV STARTUP_DEBUG_MODE=0

ENV PATH /opt/rstudio-pm/bin:$PATH
ENV PATH=/opt/rstudio-pm/bin:$PATH

# Required Python packages ----------------------------------------------------#
RUN /opt/python/${PYTHON_VERSION}/bin/python3 -m pip install --no-cache-dir build virtualenv
RUN /opt/python/${PYTHON_VERSION_ALT}/bin/python3 -m pip install --no-cache-dir build virtualenv

# Install bash auto completion ------------------------------------------------#
RUN apt-get update -qq && apt-get install -y --no-install-recommends \
bash-completion && \
apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*

# Download RStudio Package Manager ---------------------------------------------#
ARG RSPM_VERSION=2024.08.2-9
ARG RSPM_DOWNLOAD_URL=https://cdn.rstudio.com/package-manager/deb/amd64
Expand All @@ -35,12 +40,11 @@ RUN mkdir -p /var/run/rstudio-pm \
USER rstudio-pm
COPY rstudio-pm.gcfg /etc/rstudio-pm/rstudio-pm.gcfg

RUN echo "source <(rspm completion bash)" >> ~/.bashrc \
# Set up licensing to work in userspace mode. This will not prevent activating a
# license as root, but it is required to activate one as the non-root user at
# runtime. It's possible for this to fail and the trial will be considered over,
# in which case we can ignore it anyway.
&& license-manager initialize --userspace || true
RUN license-manager initialize --userspace || true

ENTRYPOINT ["tini", "--"]
CMD ["/usr/local/bin/startup.sh"]

0 comments on commit 9c8d1c8

Please sign in to comment.