Using commit hashes instead of tags, installing tofu properly

Author: James Belchamber

.devcontainer/Dockerfile

@@ -3,11 +3,17 @@ FROM docker.io/golang:latest
 
 RUN apt-get update &&\
     apt-get upgrade -y &&\
-    apt-get install -y apt-transport-https &&\
-    curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg &&\
-    echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list &&\
+    apt-get install -y apt-transport-https ca-certificates curl gnupg &&\
+    apt-get clean
+
+RUN install -m 0755 -d /etc/apt/keyrings &&\
+    curl -fsSL https://get.opentofu.org/opentofu.gpg | tee /etc/apt/keyrings/opentofu.gpg >/dev/null &&\
+    curl -fsSL https://packages.opentofu.org/opentofu/tofu/gpgkey | gpg --no-tty --batch --dearmor -o /etc/apt/keyrings/opentofu-repo.gpg >/dev/null &&\
+    chmod a+r /etc/apt/keyrings/opentofu.gpg /etc/apt/keyrings/opentofu-repo.gpg &&\
+    echo "deb [signed-by=/etc/apt/keyrings/opentofu.gpg,/etc/apt/keyrings/opentofu-repo.gpg] https://packages.opentofu.org/opentofu/tofu/any/ any main" | tee /etc/apt/sources.list.d/opentofu.list > /dev/null &&\
+    chmod a+r /etc/apt/sources.list.d/opentofu.list &&\
     apt-get update &&\
-    apt-get install google-cloud-cli -y &&\
+    apt-get install -y tofu &&\
     apt-get clean
 
 RUN curl --proto '=https' --tlsv1.2 -fsSL https://get.opentofu.org/install-opentofu.sh -o install-opentofu.sh &&\

.pre-commit-config.yaml

@@ -1,14 +1,14 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # v5.0.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
       - id: check-case-conflict
       - id: check-merge-conflict
       - id: detect-private-key
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.99.3
+    rev: 2f8bda194a420ad77a050a9de627d77a74841fdc # v1.99.4
     hooks:
       - id: terraform_fmt
       - id: terraform_validate