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.

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

add ppc64le to Architectures, support sudo in container #8342

Merged
merged 1 commit into from
Jul 15, 2020

Conversation

eddelbuettel
Copy link
Contributor

This addresses rocker-org/rocker#409 requesting ppc64le support by adding, and updates the Dockerfile by one commit adding sudo support which is useful if one launches container with -u 1000:1000 as I now do more often :)

@yosifkit
Copy link
Member

We usually recommend against adding sudo to official-images, since the same can be accomplished more securely with docker exec --user 0:0 -it ....

@eddelbuettel
Copy link
Contributor Author

I was wondering if there was a policy. In that case I will revert.

@eddelbuettel
Copy link
Contributor Author

I force-pushed an update removing sudo, leaving the other two changes.

@github-actions
Copy link

Diff for ba4dc84:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index fa25824..33d1e19 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,6 +2,6 @@ Maintainers: Carl Boettiger <rocker-maintainers@eddelbuettel.com> (@cboettig), D
 GitRepo: https://github.com/rocker-org/rocker.git
 
 Tags: 4.0.2, latest
-Architectures: amd64, arm64v8
-GitCommit: f814667c5e2bacbc4aa4f1fc35a4307e3d41154a
+Architectures: amd64, arm64v8, ppc64le
+GitCommit: 206d35749495c5309183bfabaea90091eaff5cf4
 Directory: r-base/latest
diff --git a/r-base_latest/Dockerfile b/r-base_latest/Dockerfile
index 924d2e6..3fccc7d 100644
--- a/r-base_latest/Dockerfile
+++ b/r-base_latest/Dockerfile
@@ -17,13 +17,13 @@ RUN useradd docker \
 
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \
+		ca-certificates \
 		ed \
+		fonts-texgyre \
 		less \
 		locales \
 		vim-tiny \
 		wget \
-		ca-certificates \
-		fonts-texgyre \
 	&& rm -rf /var/lib/apt/lists/*
 
 ## Configure default locale, see https://github.com/rocker-org/rocker/issues/19
@@ -50,6 +50,8 @@ RUN apt-get update \
 		r-base=${R_BASE_VERSION}-* \
 		r-base-dev=${R_BASE_VERSION}-* \
 		r-recommended=${R_BASE_VERSION}-* \
+	&& ln -s /usr/lib/R/site-library/littler/examples/build.r /usr/local/bin/build.r \
+	&& ln -s /usr/lib/R/site-library/littler/examples/check.r /usr/local/bin/check.r \
 	&& ln -s /usr/lib/R/site-library/littler/examples/install.r /usr/local/bin/install.r \
 	&& ln -s /usr/lib/R/site-library/littler/examples/install2.r /usr/local/bin/install2.r \
 	&& ln -s /usr/lib/R/site-library/littler/examples/installBioc.r /usr/local/bin/installBioc.r \

@yosifkit yosifkit merged commit 64da172 into docker-library:master Jul 15, 2020
@eddelbuettel
Copy link
Contributor Author

Thanks as always!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants