andrejus/dotfiles
1
1
Fork 0
Code Issues Activity

feat: bookworm image, docker tests pass

Browse Source
This commit is contained in:
Andrejus
2024-03-08 12:03:53 +00:00
parent 02afe496d5
commit 3e607a4b1f
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -1,7 +1,7 @@
# #
# debian-base: Base Debian image with sudo user # debian-base: Base Debian image with sudo user
# #
FROM debian:trixie-slim AS base FROM debian:bookworm-slim AS base
RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive

13
script/install.d/25-terraform.sh
View File

@@ -7,10 +7,15 @@
if ! command -v "terraform" &>/dev/null; then if ! command -v "terraform" &>/dev/null; then
if [[ "$OSTYPE" == "linux-gnu"* ]]; then if [[ "$OSTYPE" == "linux-gnu"* ]]; then
wget -qO- https://apt.releases.hashicorp.com/gpg | sudo tee /etc/apt/keyrings/hashicorp-keyring.gpg >/dev/null && # https://developer.hashicorp.com/terraform/tutorials/aws-get-started/install-cli#install-terraform
sudo chmod go+r /etc/apt/keyrings/hashicorp-keyring.gpg && wget -O- https://apt.releases.hashicorp.com/gpg |
echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/hashicorp-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list >/dev/null && gpg --dearmor |
sudo apt-get update -qq && sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg >/dev/null
echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] \
https://apt.releases.hashicorp.com $(lsb_release -cs) main" |
sudo tee /etc/apt/sources.list.d/hashicorp.list
sudo apt-get update -qq &&
sudo apt-get install -qq terraform sudo apt-get install -qq terraform
elif [[ "$OSTYPE" == "darwin"* ]]; then elif [[ "$OSTYPE" == "darwin"* ]]; then
brew tap hashicorp/tap brew tap hashicorp/tap

7
tests/test_binaries.py
View File

@@ -49,7 +49,7 @@ binaries: List[Text] = [
"gh", "gh",
"terraform", "terraform",
"docker" if not os.environ.get("SKIP_DOCKER_CONFIG") else None, "docker" if not os.environ.get("SKIP_DOCKER_CONFIG") else None,
"screenfetch", "neofetch",
# language: python # language: python
"pyenv", "pyenv",
@@ -63,10 +63,9 @@ binaries: List[Text] = [
"node", "node",
"npm", "npm",
"yarn", "yarn",
# language: java
"java",
] ]
binaries = [binary for binary in binaries if binary is not None]
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #