Update semaphore to 2.9.112

Update opentofu to 1.7

Containerfile

@@ -71,9 +71,12 @@ COPY --from=build_wheel /build/wheels /tmp/wheels
 
 ADD --chmod=755 https://raw.githubusercontent.com/ansible-semaphore/semaphore/v${SEMAPHORE_VERSION}/deployment/docker/common/semaphore-wrapper /usr/local/bin/semaphore-wrapper
 
+# Symlink **special** binaries for backwards compatibility
 RUN ln -s /usr/local/bin/spectre /usr/local/bin/mpw
+RUN ln -s /usr/bin/tofu /usr/local/bin/terraform
+
 RUN apt-get update --yes
-RUN apt-get install --yes \
+RUN apt-get install --yes --no-install-recommends \
   openssh-client \
   apt-transport-https \
   ca-certificates \

Makefile

@@ -1,6 +1,6 @@
 REPOSITORY         = vcs.enp.one/skylab/semaphore-container
-OPENTOFU_VERSION   = 1.6.2
-SEMAPHORE_VERSION  = 2.9.45
+OPENTOFU_VERSION   = 1.7.2
+SEMAPHORE_VERSION  = 2.9.112
 SPECTRE_VERSION    = main
 PYTHON_VERSION     = 3.11
 
@@ -16,4 +16,9 @@ image:  ## Build image
 	podman build . --tag $(REPOSITORY):v$(SEMAPHORE_VERSION) --build-arg "OPENTOFU_VERSION=$(OPENTOFU_VERSION)" --build-arg "SEMAPHORE_VERSION=$(SEMAPHORE_VERSION)" --build-arg "PYTHON_VERSION=$(PYTHON_VERSION)" --build-arg "SPECTRE_VERSION=$(SPECTRE_VERSION)"
 
 push: image  ## Build and publish image
+	podman login $(shell echo $(REPOSITORY) | cut -d '/' -f 1)
 	podman push $(REPOSITORY):v$(SEMAPHORE_VERSION)
+
+dev:  ## Setup local dev environment
+	poetry install --with dev
+	poetry run pre-commit install

poetry.lock

@@ -1565,6 +1565,17 @@ files = [
     {file = "shellingham-1.5.4.tar.gz", hash = "sha256:8dbca0739d487e5bd35ab3ca4b36e11c4078f3a234bfce294b0a0291363404de"},
 ]
 
+[[package]]
+name = "six"
+version = "1.16.0"
+description = "Python 2 and 3 compatibility utilities"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
+files = [
+    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
+    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
+]
+
 [[package]]
 name = "tomlkit"
 version = "0.12.4"
@@ -1715,4 +1726,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.11"
-content-hash = "dae11f8fc0d46b61d52ff2873a3cf0cc1f3ededfe89492dbb50df2ab72358e2e"
+content-hash = "0a271952e4a2d506a09f33a4009f52a668a5fcf57b9c12ff6aaddd258d1c1788"

pyproject.toml

@@ -13,6 +13,7 @@ docker = "^7.0.0"
 paramiko = "^3.4.0"
 poetry = "^1.8.1"
 poetry-plugin-export = "^1.6.0"
+six = "^1.16.0"
 
 
 [tool.poetry.group.dev.dependencies]
@@ -21,7 +22,3 @@ reorder-python-imports = "^3.12.0"
 pylint = "^3.1.0"
 pre-commit = "^3.6.2"
 pre-commit-hooks = "^4.5.0"
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"