KevinMidboe/planetposen-images
1
0
Fork 0
mirror of https://github.com/KevinMidboe/planetposen-images.git synced 2025-10-29 05:10:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dockerfile creates volumes for secrets & logs

Browse Source 
- Renamed logs folder to kebab-case
- All logger error variables renamed to err
This commit is contained in:
Kevin
2022-12-17 15:55:51 +01:00
parent 9486ad1069
commit 74abc01ec6
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@@ -16,6 +16,14 @@ EXPOSE 8000
RUN apk add --no-cache ca-certificates RUN apk add --no-cache ca-certificates
RUN mkdir -p /etc/secrets
VOLUME /etc/secrets
RUN mkdir -p /var/log/planetposen-logs
VOLUME /var/log/planetposen-logs
COPY --from=builder /go/src/github.com/kevinmidboe/planetposen-images . COPY --from=builder /go/src/github.com/kevinmidboe/planetposen-images .
ENV GOOGLE_APPLICATION_CREDENTIALS=/etc/secrets/sa-key.json
CMD ["./main"] CMD ["./main"]

14
logger/logger.go
View File

@@ -22,7 +22,7 @@ func InitLogger() *ApplicationLogger {
var baseLogger = logrus.New() var baseLogger = logrus.New()
var applicationLogger = &ApplicationLogger{baseLogger} var applicationLogger = &ApplicationLogger{baseLogger}
f, _ := os.OpenFile("/var/log/planetposen_logs/planetposen-images.log", os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666) f, _ := os.OpenFile("/var/log/planetposen-logs/planetposen-images.log", os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
applicationLogger.SetOutput(f) applicationLogger.SetOutput(f)
applicationLogger.Formatter = &logrus.JSONFormatter{ applicationLogger.Formatter = &logrus.JSONFormatter{
@@ -72,25 +72,25 @@ func (l *ApplicationLogger) UploadSuccessMessage(path string, url string) {
}).Info("Uploaded and available") }).Info("Uploaded and available")
} }
func (l *ApplicationLogger) Error(message string, error error) { func (l *ApplicationLogger) Error(message string, err error) {
l.WithFields(logrus.Fields{ l.WithFields(logrus.Fields{
"application": "planetposen-images", "application": "planetposen-images",
"err": error, "err": err,
}).Error(message) }).Error(message)
} }
func (l *ApplicationLogger) Fatal(error error) { func (l *ApplicationLogger) Fatal(err error) {
l.WithFields(logrus.Fields{ l.WithFields(logrus.Fields{
"application": "planetposen-images", "application": "planetposen-images",
"err": error, "err": err,
}).Fatal("Fatal application exception!") }).Fatal("Fatal application exception!")
} }
func (l *ApplicationLogger) GoogleApiError(message string, error error) { func (l *ApplicationLogger) GoogleApiError(message string, err error) {
l.WithFields(logrus.Fields{ l.WithFields(logrus.Fields{
"application": "planetposen-images", "application": "planetposen-images",
"go_package": "cloud.google.com/go/storage", "go_package": "cloud.google.com/go/storage",
"err": error, "err": err,
}).Error(message) }).Error(message)
} }