Skip to content

Commit 187ba6b

Browse files
committed
updated images to use for docker build
1 parent 4407998 commit 187ba6b

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

.github/workflows/docker-publish.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,18 @@ jobs:
1717
- name: Set up Docker Buildx
1818
uses: docker/setup-buildx-action@v3
1919

20-
# 2. Login to Docker Hub using YOUR personal credentials (stored in Org secrets)
20+
# 2. Login to Docker Hub using your personal credentials stored in Org secrets
2121
- name: Login to Docker Hub
2222
uses: docker/login-action@v3
2323
with:
2424
username: ${{ secrets.DOCKERHUB_USERNAME }}
2525
password: ${{ secrets.DOCKERHUB_API_KEY }}
2626

27-
# 3. Extract metadata - POINT TO THE ORGANIZATION NAMESPACE
27+
# 3. Extract metadata - Pointed to CDRL namespace
2828
- name: Extract metadata
2929
id: meta
3030
uses: docker/metadata-action@v5
3131
with:
32-
# Replace 'YOUR_ORG_NAME' with the actual Docker Hub Organization handle
3332
images: cdrl/3podr_container
3433
tags: |
3534
type=ref,event=branch

Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
# 1. Use r-ver (Works on Mac ARM64 and GitHub AMD64)
2-
FROM rocker/r-ver:latest
1+
# 1. Use the Jammy-based image to match Posit's Ubuntu 22.04 binaries
2+
FROM rocker/r-ver:4.4.2-jammy
33

44
# 2. Install system dependencies + Pandoc
5-
# Added image libraries (libpng, libjpeg) and string processing (libicu)
65
RUN apt-get update && apt-get install -y --no-install-recommends \
76
libxml2-dev \
87
libssl-dev \
@@ -17,23 +16,23 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1716
WORKDIR /project
1817

1918
# 3. FORCE BINARIES & PARALLELISM
19+
# These binaries now match the OS (Jammy) perfectly, preventing 'stringi' errors
2020
ENV RENV_CONFIG_REPOS_OVERRIDE="https://packagemanager.posit.co/cran/__linux__/jammy/latest"
2121
ENV RENV_DOWNLOAD_METHOD="libcurl"
2222
ENV RENV_PATHS_LIBRARY="renv/library"
2323

2424
# 4. Setup renv files
2525
COPY renv.lock .Rprofile ./
2626
COPY renv/activate.R renv/activate.R
27-
# Pre-create the library folder
2827
RUN mkdir -p renv/library data
2928

3029
# 5. Restore using all available CPU cores
31-
# This will now find the 'png.h' header it needs for the 'png' package
3230
RUN R -e "options(Ncpus = parallel::detectCores()); renv::restore()"
3331

34-
# 6. Copy project assets
32+
# 6. Copy project assets (Ensure configuration.yml is NOT copied if you want to mount it at runtime)
3533
COPY *.Rmd ./
3634
COPY _site.ym[l] ./
35+
# Optional: COPY configuration.yml configuration.yml (only if you want a baked-in default)
3736

3837
# 7. Render
3938
CMD ["R", "-e", "rmarkdown::render_site()"]

0 commit comments

Comments
 (0)