Compare commits
2 Commits
v2023.6.30
...
v2023.6.30
Author | SHA1 | Date | |
---|---|---|---|
5bf391b6bf | |||
74928fe413 |
@ -22,6 +22,7 @@ ENTRYPOINT ["/usr/local/bin/dumb-init", "--"]
|
|||||||
RUN mkdir -p /usr/local/bin /usr/share/bouncer/bin /etc/bouncer
|
RUN mkdir -p /usr/local/bin /usr/share/bouncer/bin /etc/bouncer
|
||||||
|
|
||||||
COPY --from=BUILD /src/dist/bouncer_linux_amd64_v1/bouncer /usr/share/bouncer/bin/bouncer
|
COPY --from=BUILD /src/dist/bouncer_linux_amd64_v1/bouncer /usr/share/bouncer/bin/bouncer
|
||||||
|
COPY --from=BUILD /src/layers /usr/share/bouncer/
|
||||||
|
|
||||||
RUN ln -s /usr/share/bouncer/bin/bouncer /usr/local/bin/bouncer \
|
RUN ln -s /usr/share/bouncer/bin/bouncer /usr/local/bin/bouncer \
|
||||||
&& /usr/share/bouncer/bin/bouncer -c '' config dump > /etc/bouncer/config.yml
|
&& /usr/share/bouncer/bin/bouncer -c '' config dump > /etc/bouncer/config.yml
|
||||||
|
@ -4,6 +4,7 @@ import (
|
|||||||
"forge.cadoles.com/cadoles/bouncer/internal/config"
|
"forge.cadoles.com/cadoles/bouncer/internal/config"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli/v2"
|
||||||
|
"gitlab.com/wpetit/goweb/logger"
|
||||||
)
|
)
|
||||||
|
|
||||||
func LoadConfig(ctx *cli.Context) (*config.Config, error) {
|
func LoadConfig(ctx *cli.Context) (*config.Config, error) {
|
||||||
@ -15,11 +16,15 @@ func LoadConfig(ctx *cli.Context) (*config.Config, error) {
|
|||||||
)
|
)
|
||||||
|
|
||||||
if configFile != "" {
|
if configFile != "" {
|
||||||
|
logger.Info(ctx.Context, "loading config", logger.F("config", configFile))
|
||||||
|
|
||||||
conf, err = config.NewFromFile(configFile)
|
conf, err = config.NewFromFile(configFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.Wrapf(err, "Could not load config file '%s'", configFile)
|
return nil, errors.Wrapf(err, "Could not load config file '%s'", configFile)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
logger.Info(ctx.Context, "using default config")
|
||||||
|
|
||||||
conf = config.NewDefault()
|
conf = config.NewDefault()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -9,6 +9,7 @@ import (
|
|||||||
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli/v2"
|
||||||
|
"gitlab.com/wpetit/goweb/logger"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Main(buildDate, projectVersion, gitRef, defaultConfigPath string, commands ...*cli.Command) {
|
func Main(buildDate, projectVersion, gitRef, defaultConfigPath string, commands ...*cli.Command) {
|
||||||
@ -29,6 +30,8 @@ func Main(buildDate, projectVersion, gitRef, defaultConfigPath string, commands
|
|||||||
workdir := ctx.String("workdir")
|
workdir := ctx.String("workdir")
|
||||||
// Switch to new working directory if defined
|
// Switch to new working directory if defined
|
||||||
if workdir != "" {
|
if workdir != "" {
|
||||||
|
logger.Info(ctx.Context, "changing working directory", logger.F("workdir", workdir))
|
||||||
|
|
||||||
if err := os.Chdir(workdir); err != nil {
|
if err := os.Chdir(workdir); err != nil {
|
||||||
return errors.Wrap(err, "could not change working directory")
|
return errors.Wrap(err, "could not change working directory")
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user