From 4428c78f0d5fbb5535f1ce594d80a6bc3b94a355 Mon Sep 17 00:00:00 2001
From: Benoit Donneaux <benoit@leastauthority.com>
Date: Thu, 23 May 2024 11:56:49 +0200
Subject: [PATCH] Use /appdata dir instead of home

Signed-off-by: Benoit Donneaux <benoit@leastauthority.com>
---
 .gitea/workflows/jekyll.yaml | 6 ++----
 docker-compose.yml           | 4 ++--
 docker/jekyll/Dockerfile     | 8 ++++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.gitea/workflows/jekyll.yaml b/.gitea/workflows/jekyll.yaml
index 1fe21df..51741a0 100644
--- a/.gitea/workflows/jekyll.yaml
+++ b/.gitea/workflows/jekyll.yaml
@@ -5,8 +5,6 @@ on: [push]
 env:
   _UID: 1000
   _GID: 1000
-  _USER: appuser
-  _GROUP: appgroup
 jobs:
   jekyll:
     runs-on: ubuntu-22.04
@@ -40,13 +38,13 @@ jobs:
       - name: Verify Jekyll container
         id: verify_image
         run: |
-          docker-compose run --rm -v "${JOB_CONTAINER_NAME}/:/home/${USER}/workspace" \
+          docker-compose run --rm -v "${JOB_CONTAINER_NAME}/:/appdata" \
           --entrypoint bash \
           jekyll -c "whoami; pwd; ls -lA ."
       - name: Build Jekyll site
         id: build_site
         run: |
-          docker-compose run --rm -v "${JOB_CONTAINER_NAME}:/home/${_USER}/workspace" \
+          docker-compose run --rm -v "${JOB_CONTAINER_NAME}:/appdata" \
           jekyll build --verbose
       - name: Verify site
         id: verify_site
diff --git a/docker-compose.yml b/docker-compose.yml
index 78e9e16..4b2b349 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,8 +9,8 @@ services:
         gid: "${_GID:-1000}"
         group: "${_GROUP:-appgroup}"
     volumes:
-      - .:/home/ubuntu/workspace
-    working_dir: /home/ubuntu/workspace
+      - .:/appdata
+    working_dir: /appdata
     ports:
       - "4000:4000"
     stdin_open: true
diff --git a/docker/jekyll/Dockerfile b/docker/jekyll/Dockerfile
index bd398dd..044cd62 100644
--- a/docker/jekyll/Dockerfile
+++ b/docker/jekyll/Dockerfile
@@ -26,15 +26,15 @@ RUN chown "${user}:${group}" "/home/${user}/Gemfile"*
 
 # Switch to non-root user
 USER ${user}
-WORKDIR /home/${user}
+WORKDIR /appdata
 
 # Install required gems
 RUN echo "gem: --no-document --user-install --bindir /home/${user}/bin" >> /home/${user}/.gemrc && \
-    echo "gempath: /home/${user}/.gem/ruby:/home/${user}/.bundle/gems/ruby/3.3.0" >> .gemrc && \
-    gem install bundler --version `sed -n -r -e '/BUNDLED WITH/,$ { s/\s+([.0-9]+)/\1/ p }' Gemfile.lock` && \
+    echo "gempath: /home/${user}/.gem/ruby:/home/${user}/.bundle/gems/ruby/3.3.0" >> /home/${user}/.gemrc && \
+    gem install bundler --version `sed -n -r -e '/BUNDLED WITH/,$ { s/\s+([.0-9]+)/\1/ p }' /home/${user}/Gemfile.lock` && \
     bundle config --global path /home/${user}/.bundle/gems && \
     bundle config --global bin /home/${user}/bin && \
-    bundle install && \
+    bundle install --gemfile=/home/${user}/Gemfile && \
     rm -rf /home/${user}/.bundle/cache
 
 ENV PATH=/home/${user}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin