diff --git a/.devfiles/bin/.gitkeep b/.devfiles/bin/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/.devfiles/docker/docker-compose.dev.yaml b/.devfiles/docker/docker-compose.dev.yaml deleted file mode 100644 index ffe73f3..0000000 --- a/.devfiles/docker/docker-compose.dev.yaml +++ /dev/null @@ -1,29 +0,0 @@ -services: - db: - image: postgres:17-alpine - ports: - - 5432:5432 - environment: - POSTGRES_USER: ${CPD_DB_USER} - POSTGRES_PASSWORD: ${CPD_DB_PASSWORD} - POSTGRES_DB: ${CPD_DB_NAME} - - adminer: - image: ghcr.io/shyim/adminerevo:latest - ports: - - 8080:8080 - environment: - ADMINER_DEFAULT_DRIVER: psql - ADMINER_DEFAULT_SERVER: db - ADMINER_DEFAULT_USER: ${CPD_DB_USER} - ADMINER_DEFAULT_PASSWORD: ${CPD_DB_PASSWORD} - ADMINER_DEFAULT_DB: ${CPD_DB_NAME} - - dbmate: - image: ghcr.io/amacneil/dbmate - restart: no - command: ["--wait", "migrate"] - volumes: - - ${PWD}/db:/db - environment: - DATABASE_URL: postgres://${CPD_DB_USER}:${CPD_DB_PASSWORD}@db:5432/${CPD_DB_NAME}?sslmode=disable diff --git a/.devfiles/docker/docker-compose.prod.yaml b/.devfiles/docker/docker-compose.prod.yaml deleted file mode 100644 index 349f7cc..0000000 --- a/.devfiles/docker/docker-compose.prod.yaml +++ /dev/null @@ -1,38 +0,0 @@ -services: - compendium: - image: compendium:latest - restart: unless-stopped - depends_on: - - db - ports: - - 3000:3000 - env_file: - - ../../.env - db: - image: postgres:17-alpine - ports: - - 5432:5432 - environment: - POSTGRES_USER: ${CPD_DB_USER} - POSTGRES_PASSWORD: ${CPD_DB_PASSWORD} - POSTGRES_DB: ${CPD_DB_NAME} - - adminer: - image: ghcr.io/shyim/adminerevo:latest - ports: - - 8080:8080 - environment: - ADMINER_DEFAULT_DRIVER: psql - ADMINER_DEFAULT_SERVER: db - ADMINER_DEFAULT_USER: ${CPD_DB_USER} - ADMINER_DEFAULT_PASSWORD: ${CPD_DB_PASSWORD} - ADMINER_DEFAULT_DB: ${CPD_DB_NAME} - - dbmate: - image: ghcr.io/amacneil/dbmate - restart: no - command: ["--wait", "migrate"] - volumes: - - ${PWD}/db:/db - environment: - DATABASE_URL: postgres://${CPD_DB_USER}:${CPD_DB_PASSWORD}@db:5432/${CPD_DB_NAME}?sslmode=disable diff --git a/.devfiles/hooks/.gitkeep b/.devfiles/hooks/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/.devfiles/hooks/commit-msg.sh b/.devfiles/hooks/commit-msg.sh deleted file mode 100644 index 1c54b90..0000000 --- a/.devfiles/hooks/commit-msg.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -set -euxo pipefail - -cog verify --file "$1" diff --git a/.devfiles/hooks/pre-commit.sh b/.devfiles/hooks/pre-commit.sh deleted file mode 100644 index 84e8fd4..0000000 --- a/.devfiles/hooks/pre-commit.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -euxo pipefail - -root="$(git rev-parse --show-toplevel)" - -cd "$root" - -gitleaks git - -# Only validate encrypted files if we are tracking any -if [[ -e .ageboxreg.yml ]]; then - agebox validate --no-decrypt -fi diff --git a/.devfiles/justfile b/.devfiles/justfile deleted file mode 100644 index ae6f604..0000000 --- a/.devfiles/justfile +++ /dev/null @@ -1,43 +0,0 @@ -set dotenv-load := true - -export PATH := source_dir() + "/bin:" + source_dir() + "/scripts:" + env("PATH") -export AGEBOX_DEBUG := "0" -export AGEBOX_PUBLIC_KEYS := source_dir() + "/public_keys.txt" - -# Install agebox from the latest github realse -install-agebox: - curl -sSL "https://github.com/slok/agebox/releases/latest/download/agebox-linux-amd64" -o .devfiles/bin/agebox - chmod + x .devfiles/bin/agebox - -[no-cd] -install-hooks: - cog install-hook --all - -# Easy and simple file repository encryption tool based on Age. -agebox +ARGS="--help": - @.devfiles/bin/agebox {{ ARGS }} - -# Encrypt the provided files, relative to project root. -encrypt +FILES: (agebox "encrypt " + FILES) - -# Encrypt all the tracked files. -encrypt-all: (agebox "encrypt --all") - -# Decrypt the provided files, relative to project root. -decrypt +FILES: (agebox "decrypt " + FILES) - -# Decrypt all the tracked files. -decrypt-all: (agebox "decrypt --all --force") - -# Reencrypt all the tracked files with the new public keys. -reencrypt: (agebox "reencrypt") - -# Show the content of an encrypted file to stdout. -crypt-peek +FILES: (agebox "cat " + FILES) - -# Validate that all tracked files are encrypted. -crypt-check:(agebox "validate --no-decrypt ") - -# Validate no credentials are pushed to git -leaks: - @gitleaks git --verbose --redact diff --git a/.devfiles/public_keys.txt b/.devfiles/public_keys.txt deleted file mode 100644 index 17fe580..0000000 --- a/.devfiles/public_keys.txt +++ /dev/null @@ -1,2 +0,0 @@ -# anavarro -age1gj7hj894l0a0lvu3fsndlkdkyc0da7963kcqhpfe43reflx3gafqnm058u diff --git a/.devfiles/scripts/.gitkeep b/.devfiles/scripts/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/.devfiles/scripts/dependecy-check.sh b/.devfiles/scripts/dependecy-check.sh deleted file mode 100755 index 684a14b..0000000 --- a/.devfiles/scripts/dependecy-check.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -root="$(git rev-parse --show-toplevel)" - -export PATH=$root/.devfiles/bin:$root/.devfiles/scripts:$PATH - -devtools=( - age - agebox - cog - gitleaks -) - -missing_tools=() - -for cmd in "${devtools[@]}"; do - if ! command -v "$cmd" &>/dev/null; then - missing_tools+=("$cmd") - fi -done - -if [[ ${#missing_tools[@]} != 0 ]]; then - echo "The following tools where not found:" - printf "%s\n" "${missing_tools[@]}" - exit 1 -else - echo -e "All tools are installed!" -fi diff --git a/.devfiles/scripts/gitignore.sh b/.devfiles/scripts/gitignore.sh deleted file mode 100755 index 0b5100d..0000000 --- a/.devfiles/scripts/gitignore.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -root="$(git rev-parse --show-toplevel)" - -base_url="https://git.alecodes.page/api/v1/gitignore/templates" - -query="$*" - -list_available() { - curl -Ssl $base_url | jq -r '.[]' -} - -if [[ -z $query ]]; then - list_available - exit 0 -fi - -tmp_file="$(mktemp)" - -for template in $query; do - # Capitalize the string - template=${template,,} - template=${template^} - - response="$(curl -Ssl "$base_url/$template")" - name="$(echo "$response" | jq -r '.name')" - content="$(echo "$response" | jq -r '.source')" - - if [[ "$content" == "null" ]]; then - echo "Template not found, available options:" - list_available - exit 1 - fi - - printf "\n### %s\n\n%s\n\n" "$name" "$content" >>"$tmp_file" -done - -sed -i -ne "/#### -- TEMPLATES BEGIN -- ####/ {p; r $tmp_file" -e ':a; n; /#### -- TEMPLATES END -- ####/ {p; b}; ba}; p' "$root/.gitignore" - -rm "$tmp_file" diff --git a/.justfile b/.justfile index f2f397b..36c44b0 100644 --- a/.justfile +++ b/.justfile @@ -8,12 +8,6 @@ release_mode := "dev" container_registry := "git.alecodes.page/alecodes" container_image_name := container_registry / bin_name -[private] -docker-compose +ARGS: - docker compose --file .devfiles/docker/docker-compose.dev.yaml --env-file .env --project-name compendium {{ARGS}} - -start-dev-services: (docker-compose "up --remove-orphans") - migrate: (docker-compose "run dbmate migrate") rollback: (docker-compose "run dbmate rollback") diff --git a/cog.toml b/cog.toml index 09b7e55..e1f8ae4 100644 --- a/cog.toml +++ b/cog.toml @@ -19,12 +19,6 @@ post_package_bump_hooks = [] [git_hooks] -[git_hooks.pre-commit] -path = ".devfiles/hooks/pre-commit.sh" - -[git_hooks.commit-msg] -path = ".devfiles/hooks/commit-msg.sh" - [commit_types] [changelog]