Fix CI build

Earlopain · Jan 25, 2024 · 06c6ed0 · 06c6ed0
1 parent b3f2fe1
commit 06c6ed0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -39,4 +39,4 @@ COPY --from=node-downloader /usr/local/lib/node_modules/esbuild/bin/esbuild /usr
 COPY --from=ruby-builder /usr/local/bundle /usr/local/bundle
 
 # Bust cache if local git ref changes and add it to the image
-ADD .git/refs/heads/master /docker/git_master_ref
+ADD .git/refs/heads/maste? /docker/git_master_ref
diff --git a/app/logical/docker_env.rb b/app/logical/docker_env.rb
@@ -20,7 +20,12 @@ def dev_mode?
   end
 
   def master_commit
-    @master_commit ||= File.read("/docker/git_master_ref").first(GitHelper::COMMIT_ABREV_LENGTH)
+    @master_commit ||= begin
+      File.read("/docker/git_master_ref").first(GitHelper::COMMIT_ABREV_LENGTH)
+    rescue Errno::ENOENT
+      # The .git folder doesn't exist during build on CI for some reason
+      "unknown"
+    end
   end
 
   def docker_relevant_files