From 8fa558881adefda5e5880b31f8e5d384e6ba75f5 Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Tue, 17 May 2022 16:11:02 -0700 Subject: [PATCH] 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. --- Dockerfile | 6 +++++- go.mod | 3 +++ hack/prepare-for-integration-tests.sh | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a5434d4f..9bd97880 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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) diff --git a/go.mod b/go.mod index 251b43e2..0a31c90c 100644 --- a/go.mod +++ b/go.mod @@ -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 ( diff --git a/hack/prepare-for-integration-tests.sh b/hack/prepare-for-integration-tests.sh index 35a9800f..7bb6ff6e 100755 --- a/hack/prepare-for-integration-tests.sh +++ b/hack/prepare-for-integration-tests.sh @@ -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