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

R 4.4.2 #498

Merged
merged 2 commits into from
Nov 11, 2024
Merged

R 4.4.2 #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0048a61
Update Dockerfile
georgestagg Nov 11, 2024
5e89190
Update to R 4.4.2
georgestagg Nov 6, 2024
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
10 changes: 5 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BASE=ghcr.io/r-wasm/flang-wasm:main
FROM $BASE as webr
FROM $BASE AS webr

# Setup environment for Emscripten
ENV PATH="/opt/emsdk:/opt/emsdk/upstream/emscripten:${PATH}"
Expand All @@ -12,7 +12,7 @@ ENV EMFC="/opt/flang/host/bin/flang-new"
#
# Installing this makes sure the toolchain installed in the later step is used
# instead of the one that the distro (Ubuntu) provides.
FROM webr as deb_build
FROM webr AS deb_build
RUN mkdir /opt/fake_rust/ && \
apt-get update && \
apt-get install -y equivs lsb-release &&\
Expand All @@ -25,7 +25,7 @@ RUN mkdir /opt/fake_rust/ && \
mv rustc_99.0_all.deb cargo_99.0_all.deb /opt/fake_rust/

# Step 2: Do the necessary setups
FROM webr as scratch
FROM webr AS webr_scratch
# Install nodejs
RUN apt-get update && \
apt-get install nodejs npm -y
Expand Down Expand Up @@ -67,7 +67,7 @@ RUN curl -L https://rig.r-pkg.org/deb/rig.gpg -o /etc/apt/trusted.gpg.d/rig.gpg
# Because $HOME gets masked by GHA with the host $HOME
ENV R_LIBS_USER=/opt/R/current/lib/R/site-library
# Don't install pak. Rig installs it into the user lib, but we want it in the system lib
RUN rig add 4.4.1 --without-pak
RUN rig add 4.4.2 --without-pak
# Install pak and rwasm into the system lib
RUN /opt/R/current/bin/R -q -e 'install.packages("pak", lib = .Library)'
RUN /opt/R/current/bin/R -q -e 'pak::pak("r-wasm/rwasm", lib = .Library)'
Expand Down Expand Up @@ -99,7 +99,7 @@ RUN sed -i.bak 's|#define TYPEOF|#define FT_TYPEOF|g' /opt/emsdk/upstream/emscri

# Step 3: Squash docker image layers
FROM webr
COPY --from=scratch / /
COPY --from=webr_scratch / /
ENV PATH="/usr/local/cargo/bin:${PATH}"
ENV RUSTUP_HOME=/usr/local/rustup
ENV CARGO_HOME=/usr/local/cargo
Expand Down
Loading