diff --git a/test/lib/lib.sh b/test/lib/lib.sh index 132848ac..0317598f 100644 --- a/test/lib/lib.sh +++ b/test/lib/lib.sh @@ -1,53 +1,56 @@ REPO_ROOT=$(git rev-parse --show-toplevel) (cd $REPO_ROOT && go install ./utils/cmd/...) +mkdir -p pki +echo '*' >>./pki/.gitignore + function cleanup() { - set +e + set +e - pkill -P $$ + pkill -P $$ - if [ -f "docker-compose.yaml" ]; then - docker compose down -t 1 || : - docker compose rm -f || : - fi + if [ -f "docker-compose.yaml" ]; then + docker compose down -t 1 || : + docker compose rm -f || : + fi } trap cleanup EXIT SIGINT function build_anubis_ko() { - ( - cd $REPO_ROOT && npm ci && npm run assets - ) - ( - cd $REPO_ROOT && - VERSION=devel ko build \ - --platform=all \ - --base-import-paths \ - --tags="latest" \ - --image-user=1000 \ - --image-annotation="" \ - --image-label="" \ - ./cmd/anubis \ - --local - ) + ( + cd $REPO_ROOT && npm ci && npm run assets + ) + ( + cd $REPO_ROOT && + VERSION=devel ko build \ + --platform=all \ + --base-import-paths \ + --tags="latest" \ + --image-user=1000 \ + --image-annotation="" \ + --image-label="" \ + ./cmd/anubis \ + --local + ) } function mint_cert() { - if [ "$#" -ne 1 ]; then - echo "Usage: mint_cert " - fi + if [ "$#" -ne 1 ]; then + echo "Usage: mint_cert " + fi - domainName="$1" + domainName="$1" - # If the transient local TLS certificate doesn't exist, mint a new one - if [ ! -f "${REPO_ROOT}/test/pki/${domainName}/cert.pem" ]; then - # Subshell to contain the directory change - ( - cd ${REPO_ROOT}/test/pki && - mkdir -p "${domainName}" && - go tool minica -domains "${domainName}" && - cd "${domainName}" && - chmod 666 * - ) - fi + # If the transient local TLS certificate doesn't exist, mint a new one + if [ ! -f "./pki/${domainName}/cert.pem" ]; then + # Subshell to contain the directory change + ( + cd ./pki && + mkdir -p "${domainName}" && + go tool minica -domains "${domainName}" && + cd "${domainName}" && + chmod 666 * + ) + fi } diff --git a/test/nginx/test.sh b/test/nginx/test.sh index 4062cfe7..ea047444 100755 --- a/test/nginx/test.sh +++ b/test/nginx/test.sh @@ -1,24 +1,15 @@ #!/usr/bin/env bash -export VERSION=$GITHUB_COMMIT-test -export KO_DOCKER_REPO=ko.local - source ../lib/lib.sh set -euo pipefail -build_anubis_ko mint_cert mimi.techaro.lol -docker run --rm -it \ - -v ./conf/nginx:/etc/nginx:ro \ - -v ../pki:/techaro/pki:ro \ +docker run --rm \ + -v $PWD/conf/nginx:/etc/nginx:ro \ + -v $PWD/pki:/techaro/pki:ro \ nginx \ nginx -t -docker compose up -d - -docker compose down -t 1 || : -docker compose rm -f || : - exit 0