Merge pull request #101 from hvalev/R-updates

Update R to 4.3.3
hvalev · Mar 6, 2024 · 6a3304a · 6a3304a
2 parents b031c82 + 4d4ad55
commit 6a3304a
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 38 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,8 +8,10 @@ on:
 
 jobs:
   buildx:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
+      - name: Free Disk Space
+        uses: ShubhamTatvamasi/free-disk-space-action@master
       - name: Checkout
         uses: actions/checkout@v4
       - name: Get Version
@@ -20,13 +22,13 @@ jobs:
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v3
-      - name: Cache Docker layers
-        uses: actions/cache@v4
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
+      # - name: Cache Docker layers
+      #   uses: actions/cache@v4
+      #   with:
+      #     path: /tmp/.buildx-cache
+      #     key: ${{ runner.os }}-buildx-${{ github.sha }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-buildx-
       - name: Available platforms
         run: echo ${{ steps.buildx.outputs.platforms }}
       - name: Login to DockerHub
@@ -45,8 +47,8 @@ jobs:
           tags: |
             hvalev/shiny-server-arm:${{ steps.get_version.outputs.version }}
             hvalev/shiny-server-arm:latest
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
       - name: Build and push shiny with devtools
         uses: docker/build-push-action@v5
         with:
@@ -58,12 +60,8 @@ jobs:
           tags: |
             hvalev/shiny-server-arm:devtools-${{ steps.get_version.outputs.version }}
             hvalev/shiny-server-arm:devtools-latest
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
-      - name: Move cache
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
       - name: Docker Hub Description
         uses: peter-evans/dockerhub-description@v4
         env:

diff --git a/.github/workflows/check_r.yml b/.github/workflows/check_r.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   updateR:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Install libs

diff --git a/.github/workflows/check_shiny.yml b/.github/workflows/check_shiny.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   updateShiny:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Fetch Shiny Server Repo
         uses: actions/checkout@v4

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,8 +8,10 @@ on:
 
 jobs:
   buildx:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
+      - name: Free Disk Space
+        uses: ShubhamTatvamasi/free-disk-space-action@master
       - name: Checkout
         uses: actions/checkout@v4
       - name: Get Version
@@ -20,13 +22,13 @@ jobs:
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v3
-      - name: Cache Docker layers
-        uses: actions/cache@v4
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
+      # - name: Cache Docker layers
+      #   uses: actions/cache@v4
+      #   with:
+      #     path: /tmp/.buildx-cache
+      #     key: ${{ runner.os }}-buildx-${{ github.sha }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-buildx-
       - name: Available platforms
         run: echo ${{ steps.buildx.outputs.platforms }}
       - name: Build shiny
@@ -35,17 +37,13 @@ jobs:
           context: .
           platforms: linux/arm/v7,linux/arm64,linux/amd64
           target: shiny
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
       - name: Build shiny with devtools
         uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/arm/v7,linux/arm64,linux/amd64
           target: shiny-with-devtools
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
-      - name: Move cache
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@
 ###########################
 FROM debian:buster-20240211 AS builder
 
-ENV V_RStudio=R-4.3.2
+ENV V_RStudio=R-4.3.3
 ENV V_ShinyServer=v1.5.21.1012
 
 RUN apt-get update && apt-get install -y \
@@ -31,7 +31,8 @@ RUN apt-get update && apt-get install -y \
     make \
     cmake \
     g++ \
-    default-jdk 
+    default-jdk && \
+    rm -rf /var/lib/apt/lists/*
 
 #Install R with blas and lapack support. Remove '--with-blas --with-lapack' to disable
 WORKDIR /usr/local/src
@@ -67,6 +68,7 @@ RUN cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DPYTHON="$PYTHON" ../
 RUN make -j4
 
 RUN ../external/node/install-node.sh
+
 # add node and npm paths respectively
 ENV PATH=$PATH:/shiny-server/ext/node/bin/:/shiny-server/bin/
 

diff --git a/R-version.txt b/R-version.txt
@@ -1 +1 @@
-4.3.2
+4.3.3
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Shiny Server on Docker for ARM
 [![build](https://github.com/hvalev/shiny-server-arm-docker/actions/workflows/build.yml/badge.svg)](https://github.com/hvalev/shiny-server-arm-docker/actions/workflows/build.yml)
-![R%20version](https://img.shields.io/badge/R%20version-4.3.2-green)
+![R%20version](https://img.shields.io/badge/R%20version-4.3.3-green)
 ![Shiny%20version](https://img.shields.io/badge/Shiny%20version-1.5.21.1012-green)
 ![Docker Pulls](https://img.shields.io/docker/pulls/hvalev/shiny-server-arm)
 ![Docker Image Size (latest by date)](https://img.shields.io/docker/image-size/hvalev/shiny-server-arm)