Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 1048 #5

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
build/workspace
!build/workspace/.gitkeep
**/.terraform
15 changes: 4 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,10 @@ WORKDIR /app
# Get dependencies - will also be cached if we won't change mod/sum
RUN go mod download

COPY .git /app/.git
COPY cmds /app/cmds
RUN mkdir -p cmds/db-manager

COPY pkg /app/pkg
COPY cmds/db-manager cmds/db-manager

RUN go install ./...

COPY scripts /app/scripts
COPY Makefile /app
# In order to reliably compute the version of the build, all files must be present.
# This is required to detect a dirty workspace using `scripts/git/version.sh`.
COPY . /app
RUN git status
RUN make interuss


Expand Down
2 changes: 2 additions & 0 deletions cmds/core-service/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
ridc "github.com/interuss/dss/pkg/rid/store/cockroach"
"github.com/interuss/dss/pkg/scd"
scdc "github.com/interuss/dss/pkg/scd/store/cockroach"
"github.com/interuss/dss/pkg/version"
"github.com/interuss/stacktrace"
"github.com/robfig/cron/v3"
"go.uber.org/zap"
Expand Down Expand Up @@ -207,6 +208,7 @@ func createSCDServer(ctx context.Context, logger *zap.Logger) (*scd.Server, erro
// RunHTTPServer starts the DSS HTTP server.
func RunHTTPServer(ctx context.Context, ctxCanceler func(), address, locality string) error {
logger := logging.WithValuesFromContext(ctx, logging.Logger).With(zap.String("address", address))
logger.Info("version", zap.Any("version", version.Current()))
logger.Info("build", zap.Any("description", build.Describe()))
logger.Info("config", zap.Bool("scd", *enableSCD))

Expand Down
Loading