From f2244334d0424998c5791aff82a38a9deb9f655c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vegard=20B=C3=B8nes?= Date: Tue, 23 Jun 2026 12:00:33 +0200 Subject: [PATCH 1/3] make radar code internal --- correctedforecaster/internal/server/server.go | 2 +- {parameters => internal}/radar/radar.go | 0 jsonfrontend/internal/server/encode/encode.go | 2 +- xmlfrontend/internal/server/server.go | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename {parameters => internal}/radar/radar.go (100%) diff --git a/correctedforecaster/internal/server/server.go b/correctedforecaster/internal/server/server.go index 5128cc4..e1bdcbe 100644 --- a/correctedforecaster/internal/server/server.go +++ b/correctedforecaster/internal/server/server.go @@ -17,7 +17,7 @@ import ( "github.com/metno/forti/correctedforecaster/internal/health" "github.com/metno/forti/correctedforecaster/internal/lookup" "github.com/metno/forti/internalprotocol" - "github.com/metno/forti/parameters/radar" + "github.com/metno/forti/internal/radar" ) func Run(upstream string, port int, topographyFiles []string) error { diff --git a/parameters/radar/radar.go b/internal/radar/radar.go similarity index 100% rename from parameters/radar/radar.go rename to internal/radar/radar.go diff --git a/jsonfrontend/internal/server/encode/encode.go b/jsonfrontend/internal/server/encode/encode.go index 60b9740..3fb6bb8 100644 --- a/jsonfrontend/internal/server/encode/encode.go +++ b/jsonfrontend/internal/server/encode/encode.go @@ -7,7 +7,7 @@ import ( "github.com/metno/forti/internalprotocol" "github.com/metno/forti/jsonfrontend/internal/server/config" "github.com/metno/forti/jsonfrontend/pkg/jsonformat" - "github.com/metno/forti/parameters/radar" + "github.com/metno/forti/internal/radar" "github.com/metno/go-weathersymbol" ) diff --git a/xmlfrontend/internal/server/server.go b/xmlfrontend/internal/server/server.go index 2e0d5a4..4a71e4b 100644 --- a/xmlfrontend/internal/server/server.go +++ b/xmlfrontend/internal/server/server.go @@ -13,7 +13,7 @@ import ( "time" "github.com/metno/forti/internalprotocol" - "github.com/metno/forti/parameters/radar" + "github.com/metno/forti/internal/radar" "github.com/metno/forti/xmlfrontend/internal/server/config" "github.com/metno/forti/xmlfrontend/internal/server/encode" "github.com/metno/forti/xmlfrontend/pkg/xmlformat" From ecd6d092923078a88fb60fb0a1fd2c4d924fe4c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vegard=20B=C3=B8nes?= Date: Tue, 23 Jun 2026 12:02:55 +0200 Subject: [PATCH 2/3] fix docker build --- correctedforecaster/build/package/Dockerfile | 1 - jsonfrontend/build/package/Dockerfile | 1 - xmlfrontend/build/package/Dockerfile | 1 - 3 files changed, 3 deletions(-) diff --git a/correctedforecaster/build/package/Dockerfile b/correctedforecaster/build/package/Dockerfile index 8fcec1d..cb57130 100644 --- a/correctedforecaster/build/package/Dockerfile +++ b/correctedforecaster/build/package/Dockerfile @@ -30,7 +30,6 @@ WORKDIR /src RUN go mod download COPY internalprotocol /src/internalprotocol -COPY parameters/ /src/parameters/ COPY correctedforecaster/internal/ /src/correctedforecaster/internal/ RUN go test ./... diff --git a/jsonfrontend/build/package/Dockerfile b/jsonfrontend/build/package/Dockerfile index 92050c0..9f06601 100644 --- a/jsonfrontend/build/package/Dockerfile +++ b/jsonfrontend/build/package/Dockerfile @@ -6,7 +6,6 @@ WORKDIR /src RUN go mod download COPY internalprotocol /src/internalprotocol -COPY parameters/ /src/parameters/ COPY jsonfrontend/internal /src/jsonfrontend/internal COPY jsonfrontend/pkg /src/jsonfrontend/pkg diff --git a/xmlfrontend/build/package/Dockerfile b/xmlfrontend/build/package/Dockerfile index 34384a4..ea9bd14 100644 --- a/xmlfrontend/build/package/Dockerfile +++ b/xmlfrontend/build/package/Dockerfile @@ -6,7 +6,6 @@ WORKDIR /src RUN go mod download COPY internalprotocol /src/internalprotocol -COPY parameters/ /src/parameters/ COPY xmlfrontend/internal /src/xmlfrontend/internal COPY xmlfrontend/pkg /src/xmlfrontend/pkg From fcf47e80dea9783d6993adff606c956d16ce9f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vegard=20B=C3=B8nes?= Date: Tue, 23 Jun 2026 12:28:33 +0200 Subject: [PATCH 3/3] add internal repo to docker build images --- correctedforecaster/build/package/Dockerfile | 1 + jsonfrontend/build/package/Dockerfile | 1 + xmlfrontend/build/package/Dockerfile | 1 + 3 files changed, 3 insertions(+) diff --git a/correctedforecaster/build/package/Dockerfile b/correctedforecaster/build/package/Dockerfile index cb57130..0deaa37 100644 --- a/correctedforecaster/build/package/Dockerfile +++ b/correctedforecaster/build/package/Dockerfile @@ -29,6 +29,7 @@ COPY go.sum /src/go.sum WORKDIR /src RUN go mod download +COPY internal/ /src/internal/ COPY internalprotocol /src/internalprotocol COPY correctedforecaster/internal/ /src/correctedforecaster/internal/ diff --git a/jsonfrontend/build/package/Dockerfile b/jsonfrontend/build/package/Dockerfile index 9f06601..5cbabff 100644 --- a/jsonfrontend/build/package/Dockerfile +++ b/jsonfrontend/build/package/Dockerfile @@ -6,6 +6,7 @@ WORKDIR /src RUN go mod download COPY internalprotocol /src/internalprotocol +COPY internal/ /src/internal/ COPY jsonfrontend/internal /src/jsonfrontend/internal COPY jsonfrontend/pkg /src/jsonfrontend/pkg diff --git a/xmlfrontend/build/package/Dockerfile b/xmlfrontend/build/package/Dockerfile index ea9bd14..20ceefb 100644 --- a/xmlfrontend/build/package/Dockerfile +++ b/xmlfrontend/build/package/Dockerfile @@ -6,6 +6,7 @@ WORKDIR /src RUN go mod download COPY internalprotocol /src/internalprotocol +COPY internal/ /src/internal/ COPY xmlfrontend/internal /src/xmlfrontend/internal COPY xmlfrontend/pkg /src/xmlfrontend/pkg