From db2b34b2dee13c160dc431204c34f012b6b2920d Mon Sep 17 00:00:00 2001 From: Dan Anglin Date: Fri, 10 Feb 2023 21:34:56 +0000 Subject: [PATCH] feat: make targets for deployment - Created new make targets for deployments of the services. - Created a new helper script for the deployment. --- .helpers/deploy.sh | 11 +++++++++++ .helpers/render.sh | 8 ++++---- Makefile | 15 +++++++++++---- 3 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 .helpers/deploy.sh diff --git a/.helpers/deploy.sh b/.helpers/deploy.sh new file mode 100644 index 0000000..43badc5 --- /dev/null +++ b/.helpers/deploy.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +set -o errexit +set -o nounset +set -o pipefail + +SERVICE=$1 + +export $(cat ./config/flow-platform-services.cfg | grep DOCKER_HOST | tr -d "\"") + +docker compose --project-directory ./build/compose up -d --build "${SERVICE}" diff --git a/.helpers/render.sh b/.helpers/render.sh index 70570bc..9e9c753 100644 --- a/.helpers/render.sh +++ b/.helpers/render.sh @@ -4,12 +4,12 @@ set -o errexit set -o nounset set -o pipefail -directory=$1 +SERVICE=$1 export $(xargs < ./config/flow-platform-services.cfg) -mkdir -p build/${directory} +mkdir -p build/${SERVICE} -for i in $(find "./templates/${directory}" -mindepth 1 -type f); do +for i in $(find "./templates/${SERVICE}" -mindepth 1 -type f); do file=$(basename ${i}) - envsubst < "./templates/${directory}/${file}" > "./build/${directory}/${file}" + envsubst < "./templates/${SERVICE}/${file}" > "./build/${SERVICE}/${file}" done diff --git a/Makefile b/Makefile index 83c2076..dfa210d 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,23 @@ -all: traefik-files forgejo-files gotosocial-files - compose: bash ./.helpers/render.sh compose traefik-files: compose bash ./.helpers/render.sh traefik -forgejo-files: forgejo-binary compose - bash ./.helpers/render.sh forgejo +traefik: traefik-files + bash ./.helpers/deploy.sh traefik forgejo-binary: bash ./.helpers/download-forgejo.sh +forgejo-files: forgejo-binary compose + bash ./.helpers/render.sh forgejo + +forgejo: forgejo-files + bash ./.helpers/deploy.sh forgejo + gotosocial-files: compose bash ./.helpers/render.sh gotosocial + +gotosocial: gotosocial-files + bash ./.helpers/deploy.sh gotosocial