From b8b0f661e6857731215798c6759e0ade9b3099f6 Mon Sep 17 00:00:00 2001 From: Santo Cariotti Date: Fri, 6 Sep 2024 16:29:40 +0200 Subject: Fix scripts and add compose --- docker-compose.yml | 37 +++++++++++++++++++++++++++++++++++++ scripts/k8s | 40 ++++++++++++++++++++++++++++++++++++++++ scripts/k8s.yaml | 40 ---------------------------------------- scripts/release | 10 ++++++++++ scripts/release.sh | 10 ---------- 5 files changed, 87 insertions(+), 50 deletions(-) create mode 100644 docker-compose.yml create mode 100755 scripts/k8s delete mode 100755 scripts/k8s.yaml create mode 100755 scripts/release delete mode 100755 scripts/release.sh diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..163890c --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,37 @@ +version: "3" +services: + postgres: + image: postgis/postgis:16-3.4 + container_name: postgis + environment: + - POSTGRES_USER=postgres + - POSTGRES_PASSWORD=password + - POSTGRES_DB=gis + ports: + - "5433:5432" + volumes: + - pgdata:/var/lib/postgresql/data + - ./schema:/docker-entrypoint-initdb.d + networks: + - default + + cas: + image: ghcr.io/cas-4/backend:latest + container_name: cas + networks: + - default + + environment: + - RUST_LOG=${RUST_LOG} + - DATABASE_URL=${DATABASE_URL} + - JWT_SECRET=${JWT_SECRET} + - ALLOWED_HOST=${ALLOWED_HOST} + - EXPO_ACCESS_TOKEN=${EXPO_ACCESS_TOKEN} + + depends_on: + - postgres + ports: + - "8000:8000" + restart: unless-stopped +volumes: + pgdata: diff --git a/scripts/k8s b/scripts/k8s new file mode 100755 index 0000000..350a19a --- /dev/null +++ b/scripts/k8s @@ -0,0 +1,40 @@ +#!/bin/bash + +usage() { + echo "Usage: $0 (apply|delete)" +} + +if [ $# -ne 1 ]; then + usage + exit 1 +fi + +command=$1 + +if [ "$1" != "apply" ] && [ "$1" != "delete" ]; then + usage + exit 1 +fi + +K8S_FOLDER="../k8s" + +if [ "$(basename "$PWD")" = "backend" ]; then + K8S_FOLDER="./k8s" +fi + +YAML_FILES=( + "cas-config.yaml" + "cas-deployment.yaml" + "cas-secret.yaml" + "cas-service.yaml" + "network-policy.yaml" + "pgdata-pvc.yaml" + "postgres-deployment.yaml" + "postgres-service.yaml" +) + +for file in "${YAML_FILES[@]}"; do + file="$K8S_FOLDER/$file" + echo "${command^}ing $file ..." + envsubst < $file | kubectl "$command" -f - +done diff --git a/scripts/k8s.yaml b/scripts/k8s.yaml deleted file mode 100755 index 350a19a..0000000 --- a/scripts/k8s.yaml +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -usage() { - echo "Usage: $0 (apply|delete)" -} - -if [ $# -ne 1 ]; then - usage - exit 1 -fi - -command=$1 - -if [ "$1" != "apply" ] && [ "$1" != "delete" ]; then - usage - exit 1 -fi - -K8S_FOLDER="../k8s" - -if [ "$(basename "$PWD")" = "backend" ]; then - K8S_FOLDER="./k8s" -fi - -YAML_FILES=( - "cas-config.yaml" - "cas-deployment.yaml" - "cas-secret.yaml" - "cas-service.yaml" - "network-policy.yaml" - "pgdata-pvc.yaml" - "postgres-deployment.yaml" - "postgres-service.yaml" -) - -for file in "${YAML_FILES[@]}"; do - file="$K8S_FOLDER/$file" - echo "${command^}ing $file ..." - envsubst < $file | kubectl "$command" -f - -done diff --git a/scripts/release b/scripts/release new file mode 100755 index 0000000..9c513f4 --- /dev/null +++ b/scripts/release @@ -0,0 +1,10 @@ +if [ $# -eq 0 ]; then + echo "You must pass the version number." + exit 1 +fi + +sed -i "3s/.*/version = \"$1\"/" Cargo.toml +cargo c +git add Cargo.* +git commit -m "release: version $1" +git tag -a "v$1" -m "Version $1" diff --git a/scripts/release.sh b/scripts/release.sh deleted file mode 100755 index 9c513f4..0000000 --- a/scripts/release.sh +++ /dev/null @@ -1,10 +0,0 @@ -if [ $# -eq 0 ]; then - echo "You must pass the version number." - exit 1 -fi - -sed -i "3s/.*/version = \"$1\"/" Cargo.toml -cargo c -git add Cargo.* -git commit -m "release: version $1" -git tag -a "v$1" -m "Version $1" -- cgit v1.2.3-18-g5258