From 8b24b15df8dd16813238cb9a05289f382a5c1e00 Mon Sep 17 00:00:00 2001 From: robonen Date: Tue, 15 Nov 2022 07:13:46 +0700 Subject: [PATCH] feat(repo): base taskfile --- .dockerignore | 1 + .env.example | 4 +++- .gitignore | 1 + Taskfile.yml | 31 +++++++++++++++++++++++++++++++ config/nginx/proxy_lb.conf | 2 +- docker-compose.yml | 6 +++--- package.json | 1 + 7 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 Taskfile.yml diff --git a/.dockerignore b/.dockerignore index 2998e63..643dd36 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,6 +2,7 @@ * # Allow files and directories +!.env !src !nuxt.config.ts !tsconfig.json diff --git a/.env.example b/.env.example index aaa2bd8..c86b21f 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,5 @@ +APP_NAME=canvas-3d + # Infrastucture config FORWARD_APP_PORT=3000 @@ -7,4 +9,4 @@ DB_PASSWORD=password DB_DATABASE=c3d # App config -NUXT_API_HOST=http://app +NUXT_API_HOST=http://localhost/api diff --git a/.gitignore b/.gitignore index 663ba3d..6c601ed 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ node_modules # Environment .env +.env diff --git a/Taskfile.yml b/Taskfile.yml new file mode 100644 index 0000000..7212045 --- /dev/null +++ b/Taskfile.yml @@ -0,0 +1,31 @@ +version: '3' + +dotenv: [ '.env' ] + +tasks: + make:env: + cmds: + - '[ ! -f .env ] && cp .env.example .env; exit 0' + + make:install: + cmds: + - '[ ! -d node_modules ] && npm install; exit 0' + + local:run: + ignore_error: true + deps: [ make:env, make:install ] + cmds: + - npm run dev + + docker:run: + deps: [ make:env ] + cmds: + - docker-compose -p $APP_NAME up -d + + docker:stop: + cmds: + - docker-compose -p $APP_NAME down + + docker:stop:force: + cmds: + - docker-compose -p $APP_NAME down -v --remove-orphans diff --git a/config/nginx/proxy_lb.conf b/config/nginx/proxy_lb.conf index 5077d16..a7be556 100644 --- a/config/nginx/proxy_lb.conf +++ b/config/nginx/proxy_lb.conf @@ -1,7 +1,7 @@ server { listen 80; - # Default docker DNS + # default docker DNS resolver 127.0.0.11 ipv6=off valid=10s; # . files diff --git a/docker-compose.yml b/docker-compose.yml index dd9760c..958f347 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ services: - app app: -# container_name: app + # container_name: app build: context: . dockerfile: Dockerfile @@ -25,8 +25,8 @@ services: replicas: 2 expose: - '${FORWARD_APP_PORT:-3000}' -# ports: -# - '${FORWARD_APP_PORT:-3000}:3000' + # ports: + # - '${FORWARD_APP_PORT:-3000}:3000' networks: - c3d_net depends_on: diff --git a/package.json b/package.json index 2f92493..1ac4d73 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "bugs": { "url": "https://github.com/robonen/canvas-3d/issues?q=is:open is:issue label:bug" }, + "author": "Andrew Robonen ", "license": "MIT", "private": true, "scripts": {