Fix/no commit hash on the deployed project (#611)

* define GIT_COMMIT_SHA in Dockerfile

* check for GIT_COMMIT_SHA environment variable presence in GitDCommitSha.current_sha

* add a new context to test if GIT_COMMIT_SHA exists

Author: ihab4real

.controlplane/Dockerfile

@@ -76,3 +76,7 @@ ENTRYPOINT ["./.controlplane/entrypoint.sh"]
 # Default args to pass to the entry point that can be overridden
 # For Kubernetes and ControlPlane, these are the "workload args"
 CMD ["./bin/rails", "server"]
+
+# Current commit hash environment variable
+ARG GIT_COMMIT_SHA
+ENV GIT_COMMIT_SHA=${GIT_COMMIT_SHA}

app/models/git_commit_sha.rb

@@ -5,7 +5,9 @@ class GitCommitSha
   attr_writer :current_sha
 
   def self.current_sha
-    @current_sha ||= retrieve_sha_from_file.presence || retrieve_sha_from_git
+    @current_sha ||= ENV["GIT_COMMIT_SHA"].presence ||
+                     retrieve_sha_from_file.presence ||
+                     retrieve_sha_from_git
   end
 
   def self.reset_current_sha

spec/system/pages_spec.rb

@@ -17,13 +17,16 @@
     GitCommitSha.reset_current_sha
   end
 
-  context "when .source_version file does not exist" do
-    let(:sha) { "94d92356828a56db25fccff9d50f41c525eead5x" }
+  context "when GIT_COMMIT_SHA env var exists" do
+    let(:sha) { "94d92356828a56db25fccff9d50f41c525eead5z" }
     let(:expected_text) { "94d9235" }
 
     before do
-      # stub this method since we need to control what the sha actually is
-      allow(GitCommitSha).to receive(:retrieve_sha_from_git) { sha }
+      ENV["GIT_COMMIT_SHA"] = sha
+    end
+
+    after do
+      ENV.delete("GIT_COMMIT_SHA")
     end
 
     it_behaves_like "Git Commit SHA"
@@ -39,4 +42,16 @@
 
     it_behaves_like "Git Commit SHA"
   end
+
+  context "when falling back to git command" do
+    let(:sha) { "94d92356828a56db25fccff9d50f41c525eead5x" }
+    let(:expected_text) { "94d9235" }
+
+    before do
+      # stub this method since we need to control what the sha actually is
+      allow(GitCommitSha).to receive(:retrieve_sha_from_git) { sha }
+    end
+
+    it_behaves_like "Git Commit SHA"
+  end
 end