Merge branch 'main' of https://git.griefed.de/prosper/gitlab-ci-cd

# Conflicts:
#	Dockerfile

CHANGELOG.md

+## [2.1.0](https://git.griefed.de/prosper/gitlab-ci-cd/compare/2.0.9...2.1.0) (2022-08-28)
+
+
+### 🚀 Features
+
+* Add `act`(https://github.com/nektos/act) to image to allow for GitHub workflow runs even though we are not on GitHub :-] ([677604d](https://git.griefed.de/prosper/gitlab-ci-cd/commit/677604d899cac831f2720d4786fb10a8a6078934))
+
 ## [2.0.9](https://git.griefed.de/prosper/gitlab-ci-cd/compare/2.0.8...2.0.9) (2022-08-01)
 
 

Dockerfile

@@ -72,7 +72,11 @@ RUN \
   npm install -g \
     @quasar/cli && \
   echo "**** Installing act ****" && \
+<<<<<<< HEAD
     curl https://raw.githubusercontent.com/nektos/act/b23bbefc365012886192e477a88d38a0909ecba1/install.sh | sudo bash && \
+=======
+    curl https://raw.githubusercontent.com/nektos/act/b23bbefc365012886192e477a88d38a0909ecba1/install.sh | bash && \
+>>>>>>> 209e392b842f6e294c372a52a55b65b3bcb205a3
   echo "**** Cleanup ****" && \
   rm -rf \
     /var/cache/apk/* \