Skip to content

Commit

Permalink
fix: broken config
Browse files Browse the repository at this point in the history
  • Loading branch information
Runar Kristoffersen committed Sep 25, 2022
1 parent 26e141a commit 91168a8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ container: build-web
container-publish:
${MAKE} -J2 container-publish_fly container-publish_docker
container-publish_fly:
docker push registry.fly.io/skiver:$(version)
docker push registry.fly.io/skiver:latest
docker push registry.fly.io/skiver:$(version)-alpine
docker push registry.fly.io/skiver:alpine
docker push --format v2s2 registry.fly.io/skiver:$(version)
docker push --format v2s2 registry.fly.io/skiver:latest
docker push --format v2s2 registry.fly.io/skiver:$(version)-alpine
docker push --format v2s2 registry.fly.io/skiver:alpine
container-publish_docker:
docker push runardocker/skiver-api:latest
docker push runardocker/skiver-api:alpine
Expand All @@ -73,7 +73,7 @@ container-publish_docker:
docker push runardocker/skiver-api:$(version)-alpine
docker push runardocker/skiver-api:$(version)-grafana

publish: check-git-clean gen test release container container-publish fly
publish: check-git-clean gen test release container container-publish fly_current

release: check-git-clean test
goreleaser release
Expand Down Expand Up @@ -118,8 +118,8 @@ fly:
@echo "Will deploy image 'registry.fly.io/skiver:$(version)-alpine' on fly"
fly deploy --local-only -i "registry.fly.io/skiver:$(version)-alpine" --detach
fly logs
fly_latest: container
fly_current: container container-publish_fly
./fly.sh .x/skiver-fly.toml
@echo "Will deploy image 'registry.fly.io/skiver:latest' on fly"
fly deploy -i "registry.fly.io/skiver:latest" --detach
fly deploy -i "registry.fly.io/skiver:$(version)-alpine" --detach
fly logs
2 changes: 1 addition & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ type S3BaseConfig struct {
}
type S3UploaderConfig struct {
// S3-compatible target
S3BaseConfig
S3BaseConfig `mapstructure:",squash"`
// Can be used to override the url that is produced.
// Golang-templating is available
// Variables:
Expand Down

0 comments on commit 91168a8

Please sign in to comment.