Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
ElektronikerDev committed Dec 25, 2023
2 parents 6f528d0 + 16aa9e8 commit e18137c
Show file tree
Hide file tree
Showing 6 changed files with 125 additions and 3 deletions.
75 changes: 75 additions & 0 deletions .air.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# Config file for [Air](https://github.com/cosmtrek/air) in TOML format

# Working directory
# . or absolute path, please note that the directories following must be under root.
root = "."
tmp_dir = "tmp"

[build]
# Array of commands to run before each build
pre_cmd = []
# Just plain old shell command. You could use `make` as well.
cmd = "go build -o ./tmp/main ./cmd/bwizard/."
# Array of commands to run after ^C
post_cmd = []
# Binary file yields from `cmd`.
bin = "tmp/main"
# Customize binary, can setup environment variables when run your app.
full_bin = "APP_ENV=dev APP_USER=air ./tmp/main"
# Watch these filename extensions.
include_ext = ["go", "tpl", "tmpl", "html"]
# Ignore these filename extensions or directories.
exclude_dir = ["assets", "tmp", "vendor", "web"]
# Watch these directories if you specified.
# include_dir = []
# Watch these files.
include_file = []
# Exclude files.
exclude_file = []
# Exclude specific regular expressions.
exclude_regex = ["_test\\.go"]
# Exclude unchanged files.
exclude_unchanged = true
# Follow symlink for directories
follow_symlink = true
# This log file places in your tmp_dir.
log = "air.log"
# Poll files for changes instead of using fsnotify.
poll = false
# Poll interval (defaults to the minimum interval of 500ms).
poll_interval = 500 # ms
# It's not necessary to trigger build each time file changes if it's too frequent.
delay = 0 # ms
# Stop running old binary when build errors occur.
stop_on_error = true
# Send Interrupt signal before killing process (windows does not support this feature)
send_interrupt = false
# Delay after sending Interrupt signal
kill_delay = 500 # nanosecond
# Rerun binary or not
rerun = false
# Delay after each executions
rerun_delay = 500
# Add additional arguments when running binary (bin/full_bin). Will run './tmp/main hello world'.
args_bin = []

[log]
# Show log time
time = false
# Only show main log (silences watcher, build, runner)
main_only = false

[color]
# Customize each part's color. If no color found, use the raw app log.
main = "magenta"
watcher = "cyan"
build = "yellow"
runner = "green"

[misc]
# Delete tmp directory on exit
clean_on_exit = true

[screen]
clear_on_rebuild = true
keep_scroll = true
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.idea/
.idea/
tmp/
13 changes: 13 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Choose whatever you want, version >= 1.16
FROM golang:1.21-alpine

EXPOSE 8099

WORKDIR /app

RUN go install github.com/cosmtrek/air@latest

COPY go.mod go.sum ./
RUN go mod download

CMD ["air", "-c", ".air.toml"]
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright 2023 DevStorage IT-Services UG (haftungsbeschränkt) & Co. KG, Germany and all contributors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
33 changes: 33 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
version: '3.8'

volumes:
db_data:

networks:
bwizard:

services:
db:
image: mariadb
environment:
MYSQL_ROOT_PASSWORD: bwizard
MYSQL_DATABASE: bwizard
MYSQL_USER: bwizard
MYSQL_PASSWORD: bwizard
volumes:
- db_data:/var/lib/mysql
networks:
- bwizard
wizard:
build:
context: .
# Correct the path to your Dockerfile
dockerfile: Dockerfile
ports:
- 8080:3000
- 8099:8099
# Important to bind/mount your codebase dir to /app dir for live reload
volumes:
- ./:/app
networks:
- bwizard
2 changes: 1 addition & 1 deletion internal/pkg/wizardapi/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ func StartAPIServer() {

api.RegisterHandlers(e, handler)

e.Logger.Fatal(e.Start(net.JoinHostPort("127.0.0.1", *port)))
e.Logger.Fatal(e.Start(net.JoinHostPort("0.0.0.0", *port)))
}

0 comments on commit e18137c

Please sign in to comment.