Remove this commit before merging: build using local fosite source code

This is a dirty hack to be able to run the integration tests with a
fixed version of fosite. This should not be merged.
This commit is contained in:
Ryan Richard 2022-05-17 16:11:02 -07:00
parent 9e39df405a
commit 8fa558881a
3 changed files with 10 additions and 2 deletions

View File

@ -5,8 +5,12 @@
FROM golang:1.18.1 as build-env
# TODO Do not commit. Copy the locally modified source code of fosite.
COPY fosite /Users/ryan/workspace/fosite
WORKDIR /work
COPY . .
# TODO Do not commit. Copy the local pinniped source code as usual, but assume that the build context is one directory up.
COPY pinniped .
ARG GOPROXY
# Build the executable binary (CGO_ENABLED=0 means static linking)

3
go.mod
View File

@ -34,6 +34,9 @@ replace (
go.opentelemetry.io/otel/sdk/metric => go.opentelemetry.io/otel/sdk/metric v0.20.0
go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v0.20.0
go.opentelemetry.io/proto/otlp => go.opentelemetry.io/proto/otlp v0.7.0
// TODO Do not commit. Temporary "replace" to use local bugfixed source code.
github.com/ory/fosite => /Users/ryan/workspace/fosite
)
require (

View File

@ -236,7 +236,8 @@ if [[ "$do_build" == "yes" ]]; then
else
log_note "Docker building the app..."
# DOCKER_BUILDKIT=1 is optional on MacOS but required on linux.
DOCKER_BUILDKIT=1 docker build . --tag "$registry_repo_tag"
# TODO Do not commit. Temporarily use the parent directory as the build context so we can copy the local fosite source into the build.
DOCKER_BUILDKIT=1 docker build -f Dockerfile --tag "$registry_repo_tag" ..
fi
fi