Skip to content

Commit

Permalink
checkpoint
Browse files Browse the repository at this point in the history
Signed-off-by: Jeff Ortel <jortel@redhat.com>
  • Loading branch information
jortel committed Mar 28, 2024
1 parent 4adefc5 commit f74c1e0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 24 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ ENV HOME=/addon ADDON=/addon
WORKDIR /addon
ARG GOPATH=/opt/app-root
COPY --from=shim /usr/bin/windup-shim /usr/bin
COPY --from=addon $GOPATH/src/settings.json $ADDON/opt/settings.json
COPY --from=addon $GOPATH/src/settings.yaml $ADDON/opt/settings.yaml
COPY --from=addon $GOPATH/src/bin/addon /usr/bin
ENTRYPOINT ["/usr/bin/addon"]
2 changes: 1 addition & 1 deletion cmd/settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -181,5 +181,5 @@ func (r *Settings) getProxy(kind string) (url string, excluded []string, err err

// Path returns the file path.
func (r *Settings) path() (p string) {
return path.Join(OptDir, "settings.json")
return path.Join(OptDir, "settings.yaml")
}
22 changes: 0 additions & 22 deletions settings.json

This file was deleted.

5 changes: 5 additions & 0 deletions settings.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
- name: builtin
initConfig:
- {}

0 comments on commit f74c1e0

Please sign in to comment.