From 079d4dcabf93ecef961616970b1eab83d10e264a Mon Sep 17 00:00:00 2001 From: "Buster \"Silver Eagle\" Neece" Date: Thu, 23 Sep 2021 21:13:21 -0500 Subject: [PATCH] Gitpod polish. --- .gitpod.yml | 11 +++++++++-- Makefile | 9 +++++++++ docker-compose.gitpod.yml | 29 +++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 docker-compose.gitpod.yml diff --git a/.gitpod.yml b/.gitpod.yml index ff52840e1..289d90f97 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -2,10 +2,15 @@ github : prebuilds : addCheck : false +vscode : + extensions : + - bmewburn.vscode-intelephense-client + - editorconfig.editorconfig + tasks : - name : Docker Build init : | - yes '' | bash docker.sh install-dev + make install-gitpod gp sync-done docker-build command : | make up @@ -13,6 +18,8 @@ tasks : - name : Static Service openMode : split-right - command : + init : | gp sync-await docker-build + make frontend-build + command : | make frontend-bash diff --git a/Makefile b/Makefile index 0adcb0a2a..cdcd8f8ac 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,15 @@ list: @LC_ALL=C $(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$' +install-gitpod: + cp docker-compose.sample.yml docker-compose.yml + cp docker-compose.gitpod.yml docker-compose.override.yml + cp dev.env .env + cp azuracast.dev.env azuracast.env + + docker-compose build + docker-compose run --rm --user="azuracast" web azuracast_install "$@" + up: docker-compose up -d diff --git a/docker-compose.gitpod.yml b/docker-compose.gitpod.yml new file mode 100644 index 000000000..f83ddbddc --- /dev/null +++ b/docker-compose.gitpod.yml @@ -0,0 +1,29 @@ +services : + nginx_proxy : + volumes : + - ./util/local_ssl:/etc/nginx/certs + - /var/run/docker.sock:/tmp/docker.sock:ro + + nginx_proxy_letsencrypt : + volumes : + - /var/run/docker.sock:/tmp/docker.sock:ro + + web : + build : + context : . + volumes : + - ./util/local_ssl:/etc/nginx/certs:ro + - ./vendor:/var/azuracast/www/vendor + - .:/var/azuracast/www + + mariadb : + ports : + - "127.0.0.1:3306:3306" + + redis : + ports : + - "127.0.0.1:6379:6379" + + stations : + volumes : + - ./util/local_ssl:/etc/nginx/certs