From 677750ef51079def6f18899128db42daa38dd380 Mon Sep 17 00:00:00 2001 From: boojack Date: Sat, 14 Jan 2023 08:00:07 +0800 Subject: [PATCH] chore: upgrade version to `0.10.1` (#949) --- Dockerfile | 6 ++---- server/metric_collector.go | 2 +- server/resource.go | 4 ++-- server/version/version.go | 4 ++-- store/db/db.go | 6 ++++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2685444c..652e592e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,15 +4,13 @@ WORKDIR /frontend-build COPY ./web/ . -RUN yarn -RUN yarn build +RUN yarn && yarn build # Build backend exec file. FROM golang:1.19.3-alpine3.16 AS backend WORKDIR /backend-build -RUN apk update -RUN apk --no-cache add gcc musl-dev +RUN apk update && apk add --no-cache gcc musl-dev COPY . . COPY --from=frontend /frontend-build/dist ./server/dist diff --git a/server/metric_collector.go b/server/metric_collector.go index 9c755de6..01acc981 100644 --- a/server/metric_collector.go +++ b/server/metric_collector.go @@ -27,7 +27,7 @@ func (s *Server) registerMetricCollector() { mc := &MetricCollector{ collector: c, ID: s.ID, - Enabled: true, + Enabled: false, Profile: s.Profile, } s.Collector = mc diff --git a/server/resource.go b/server/resource.go index cf04f3eb..9b627733 100644 --- a/server/resource.go +++ b/server/resource.go @@ -268,8 +268,8 @@ func (s *Server) registerResourcePublicRoutes(g *echo.Group) { return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to fetch resource ID: %v", resourceID)).SetInternal(err) } - resourceType := resource.Type - if strings.HasPrefix(resource.Type, "text") || strings.HasPrefix(resource.Type, "application") { + resourceType := strings.ToLower(resource.Type) + if strings.HasPrefix(resourceType, "text") || strings.HasPrefix(resourceType, "application") { resourceType = echo.MIMETextPlain } c.Response().Writer.Header().Set(echo.HeaderCacheControl, "max-age=31536000, immutable") diff --git a/server/version/version.go b/server/version/version.go index df7a572e..8e537d09 100644 --- a/server/version/version.go +++ b/server/version/version.go @@ -9,10 +9,10 @@ import ( // Version is the service current released version. // Semantic versioning: https://semver.org/ -var Version = "0.10.0" +var Version = "0.10.1" // DevVersion is the service current development version. -var DevVersion = "0.10.0" +var DevVersion = "0.10.1" func GetCurrentVersion(mode string) string { if mode == "dev" { diff --git a/store/db/db.go b/store/db/db.go index 5ef6f4cc..2a9d4e9e 100644 --- a/store/db/db.go +++ b/store/db/db.go @@ -73,13 +73,15 @@ func (db *DB) Open(ctx context.Context) (err error) { return fmt.Errorf("failed to find migration history, err: %w", err) } if len(migrationHistoryList) == 0 { - if _, err = db.UpsertMigrationHistory(ctx, &MigrationHistoryUpsert{ + _, err := db.UpsertMigrationHistory(ctx, &MigrationHistoryUpsert{ Version: currentVersion, - }); err != nil { + }) + if err != nil { return fmt.Errorf("failed to upsert migration history, err: %w", err) } return nil } + migrationHistoryVersionList := []string{} for _, migrationHistory := range migrationHistoryList { migrationHistoryVersionList = append(migrationHistoryVersionList, migrationHistory.Version)