From c7dedf471df03fccb5fef503880da99511b6008b Mon Sep 17 00:00:00 2001
From: John Gatward <John.Gatward@sainsburys.co.uk>
Date: Tue, 4 Aug 2026 20:26:46 +0100
Subject: [PATCH] [main]: fix Dockerfile

---
 .gitea/workflows/docker.yaml | 20 ++++++++++++++++----
 Dockerfile                   |  6 +++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml
index 28a3069..f68a950 100644
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@@ -3,6 +3,10 @@ name: Build and Push Docker Image
 on:
   push:
     branches: [ "main" ]
+  workflow_dispatch:
+
+env:
+  IMAGE_NAME: gitea.umbra.mom/ciaran/football-competitiveness
 
 jobs:
   build:
@@ -21,10 +25,18 @@ jobs:
             -u "$REGISTRY_USER" \
             --password-stdin
 
-      - name: Build image
+      - name: Set up buildx
         run: |
-          docker build -t gitea.umbra.mom/ciaran/football-competitiveness:latest .
+          docker buildx create --name ci-builder --driver docker-container --use || docker buildx use ci-builder
+          docker buildx inspect --bootstrap
 
-      - name: Push image
+      - name: Build and push image (with cache)
         run: |
-          docker push gitea.umbra.mom/ciaran/football-competitiveness:latest
+          docker buildx build \
+            --pull \
+            --platform linux/amd64 \
+            -t "${IMAGE_NAME}:latest" \
+            --cache-from "type=registry,ref=${IMAGE_NAME}:buildcache" \
+            --cache-to "type=registry,ref=${IMAGE_NAME}:buildcache,mode=max" \
+            --push \
+            .
diff --git a/Dockerfile b/Dockerfile
index 64b78d6..5bd226f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,11 +22,11 @@ COPY . /srv/shiny-server/
 
 # Prevent renv attempting to use pak
 ENV RENV_CONFIG_PAK_ENABLED=FALSE
+ENV CFLAGS=-Wno-error=format-security
 
 # Install renv and restore project packages
-RUN R -e "install.packages('renv', repos='https://cran.rstudio.com'); \
-          renv::init(bare = TRUE); \
-          renv::restore(prompt = FALSE)"
+RUN R --vanilla -e "install.packages('renv', repos='https://cran.rstudio.com')" && \
+    R --vanilla -e "renv::restore(project='/srv/shiny-server', lockfile='/srv/shiny-server/renv.lock', prompt=FALSE)"
 
 # Permissions
 RUN chown -R shiny:shiny /srv/shiny-server