Merged in feature/devbox (pull request #11)

Add Devbox

* adddevbox

* cleanupdockerfile

* testscripts

scripts/Taskfile.yml

@@ -3,6 +3,10 @@
 
 version: '3'
 
+vars:
+  CONTEXT: ..
+  OUT_DIR: out
+  
 includes:
   deps:
     dir: "{{.CONTEXT}}"
@@ -23,11 +27,6 @@ includes:
     dir: "{{.CONTEXT}}"
     taskfile: database.yml
 
-vars:
-  CONTEXT: ..
-  OUT_DIR: out
-  OUT_FILE: "{{.OUT_DIR}}/main_grpc"
-
 tasks:
   generate:
     deps:
@@ -38,9 +37,9 @@ tasks:
       - task code:lint
       - task db:lint
       - task yaml:lint
+      - task json:lint
       - task docker:lint
       - task compose:lint
-      - task shell:lint
       - task proto:lint
   lint:fix:
     cmds:
@@ -48,9 +47,9 @@ tasks:
       - task proto:lint:fix
       - task db:lint
       - task yaml:lint
+      - task json:lint:fix
       - task docker:lint
       - task compose:lint
-      - task shell:lint
   code:lint:
     cmds:
       - golangci-lint run
@@ -61,9 +60,12 @@ tasks:
   yaml:lint:
     cmds:
       - yamllint . -s
-  shell:lint:
+  json:lint:
     cmds:
-      - shellcheck --shell=sh scripts/install-deps.sh
+      - jsonlint devbox.json -q -s
+  json:lint:fix:
+    cmds:
+      - jsonlint devbox.json -q -s -i
   docs:
     cmds:
       - godoc -http=:6060

scripts/compose.yml

@@ -21,4 +21,4 @@ tasks:
       - docker compose -f {{.COMPOSE_FILE}} down
   lint:
     cmds:
-      - docker compose -f {{.COMPOSE_FILE}} config
+      - docker compose -f {{.COMPOSE_FILE}} config -q --resolve-image-digests

scripts/database.yml

@@ -12,10 +12,10 @@ tasks:
       - |
         task compose:up:bg
         task db:mig:run
-        sqlc generate --file ../sqlc.yml
+        sqlc generate --file sqlc.yml
   lint:
     cmds:
-      - sqlc vet --file ../sqlc.yml
+      - sqlc vet --file sqlc.yml
   mig:create:
     cmds:
       - |

scripts/dependencies.yml

@@ -4,22 +4,8 @@
 version: '3'
 
 tasks:
-  install:
+  download:
     cmds:
-      - go install golang.org/x/tools/cmd/godoc@v0.29.0
-      - go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.62.2
-      - go install github.com/yoheimuta/protolint/cmd/protolint@v0.52.0
-      - go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.0
-      - go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.5.1
-      - go install github.com/zabio3/godolint@v1.0.3
-      - go install github.com/wasilibs/go-yamllint/cmd/yamllint@v1.35.1
-      - go install github.com/sqlc-dev/sqlc/cmd/sqlc@v1.27.0
-      - |
-        go install -tags 'postgres' \
-        github.com/golang-migrate/migrate/v4/cmd/migrate@v4.18.1
-      - go install github.com/vektra/mockery/v2@v2.50.0
-      - curl -sfL https://direnv.net/install.sh | bash
-      - direnv allow
       - go mod download
   tidy:
     cmds:

scripts/docker.yml

@@ -9,7 +9,7 @@ vars:
 tasks:
   lint:
     cmds:
-      - godolint {{.DOCKERFILE}}
+      - hadolint {{.DOCKERFILE}} -t none
   build:
     cmds:
       - docker build -t {{.IMAGE_NAME}} -f {{.DOCKERFILE}} .

scripts/install-deps.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Install Taskfile
-sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b ~/.local/binintegration
-
-# Install dependencies
-task deps:install

scripts/tests.yml

@@ -3,11 +3,6 @@
 
 version: '3'
 
-includes:
-  docker:
-    taskfile: docker.yml
-    internal: true
-
 vars:
   COVERAGE_FILE: "{{.OUT_DIR}}/coverage.out"
 
@@ -43,15 +38,13 @@ tasks:
         fi
     silent: true
   integration:
-    deps:
-      - docker:build
     cmds:
+      - task docker:build
       - task test:integration:nobuild
   integration:nocache:
-    deps:
-      - docker:build
     cmds:
-      - go test -count=1 -v test/...
+      - task docker:build
+      - go test -count=1 -v ./test/...
   integration:nobuild:
     cmds:
-      - go test -v test/...
+      - go test -v ./test/...