From 247b411011451fe2c4077802d849263f10e6a1ca Mon Sep 17 00:00:00 2001
From: lilleman <lilleman@larvit.se>
Date: Sun, 4 Feb 2024 04:15:44 +0100
Subject: [PATCH] New pipelines and stuff

---
 .gitea/test-and-build.sh            | 22 ++++++++++++++++++++++
 .gitea/workflows/test-and-build.yml |  0
 LICENSE                             |  2 +-
 README.md                           |  4 +---
 docker-compose.yml => compose.yml   |  3 +--
 5 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100755 .gitea/test-and-build.sh
 create mode 100644 .gitea/workflows/test-and-build.yml
 rename docker-compose.yml => compose.yml (94%)

diff --git a/.gitea/test-and-build.sh b/.gitea/test-and-build.sh
new file mode 100755
index 0000000..e5c8a3b
--- /dev/null
+++ b/.gitea/test-and-build.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+curl \
+--fail-with-body \
+-H "Authorization: ${RUNNER_API_KEY}" \
+-XPOST 192.168.1.186 \
+-H 'Content-Type: application/json; charset=utf-8' \
+--data-binary @- <<EOF
+{
+	"commands": [
+		"git clone --single-branch --branch ${GITHUB_REF_NAME} --depth 1 ssh://git@gitea.larvit.se:21022/pwrpln/auth-api.git",
+        "cd auth-api",
+        "docker compose build",
+        "docker compose --profile tests build",
+        "docker compose run --rm tests",
+        "docker compose down -v --remove-orphans -t0",
+		"echo \"${DOCKER_PASSWORD}\" | docker login gitea.larvit.se --username ${DOCKER_USERNAME} --password-stdin",
+		"docker build -t gitea.larvit.se/pwrpln/auth-api:${GITHUB_REF_NAME} .",
+		"docker push gitea.larvit.se/pwrpln/auth-api:${GITHUB_REF_NAME}"
+	]
+}
+EOF
diff --git a/.gitea/workflows/test-and-build.yml b/.gitea/workflows/test-and-build.yml
new file mode 100644
index 0000000..e69de29
diff --git a/LICENSE b/LICENSE
index 9684246..24f855c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2022 Larv IT AB
+Copyright 2024 Larv IT AB
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/README.md b/README.md
index 97552aa..9ee819f 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,6 @@ A tiny REST API for auth. Register accounts, auth with api-key or name/password,
 
 ## Quick start with docker compose
 
-Migrate database: `docker-compose run --rm db-migrations`
-
 Start the API (on port 4000 by default): `docker-compose up -d`
 
 Point your browser to `http://localhost:4000` to view the swagger API documentation.
@@ -20,7 +18,7 @@ The account field "role" is a bit special, in that if it contains "admin" as one
 
 ## Tests
 
-Run integration tests (Requires migrated database and started API): `docker-compose run --rm tests`
+Run integration tests: `docker-compose run --rm tests`
 
 ## Deploy a new version
 
diff --git a/docker-compose.yml b/compose.yml
similarity index 94%
rename from docker-compose.yml
rename to compose.yml
index b282529..3622592 100644
--- a/docker-compose.yml
+++ b/compose.yml
@@ -5,7 +5,6 @@ services:
     image: postgres:15.2-alpine3.17
     user: postgres
     environment:
-      - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=prutt
       - POSTGRES_DB=auth
     # ports:
@@ -26,7 +25,7 @@ services:
     command: ["--wait", "up"]
     depends_on:
       postgres:
-        condition: service_started
+        condition: service_healthy
 
   api:
     build: .