Skip to content

recent changes to add support for local repos broke the script #2163

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.

Sign up for GitHub

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

Merged
garypen merged 3 commits into from
Nov 28, 2022
Merged

recent changes to add support for local repos broke the script #2163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6bd63d
recent changes to add support for local repos broke the script
Nov 25, 2022
ac3d342
add changelog
Nov 25, 2022
cca982d
Merge branch 'dev' into garypen/fix-build-docker
Nov 28, 2022
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
8 changes: 7 additions & 1 deletion NEXT_CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,12 @@ By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/p

## 🐛 Fixes

### fix build_docker_image.sh script when using default repo ([PR #2163](https://github.com/apollographql/router/pull/2163))

Adding the `-r` flag recently broke the existing functionality to build from the default repo using `-b`. This fixes that.

By [@garypen](https://github.com/garypen) in https://github.com/apollographql/router/pull/2163

### Improve errors when subgraph returns non-GraphQL response with a non-2xx status code ([Issue #2117](https://github.com/apollographql/router/issues/2117))

The error response will now contain the status code and status name. Example: `HTTP fetch failed from 'my-service': 401 Unauthorized`
Expand Down Expand Up @@ -247,7 +253,7 @@ The docs CORS regex example now displays a working and safe way to allow `HTTPS`
By [@col](https://github.com/o0Ignition0o) in https://github.com/apollographql/router/pull/2152


### update documentation to reflect new examples structure ([Issue #2095](https://github.com/apollographql/router/pull/2133))
### update documentation to reflect new examples structure ([Issue #2095](https://github.com/apollographql/router/issues/2095))

We recently updated the examples directory structure. This fixes the documentation links to the examples. It also makes clear that rhai subgraph fields are read-only, since they are shared resources.

Expand Down
8 changes: 4 additions & 4 deletions dockerfiles/diy/build_docker_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ else
if [ "${BUILD_IMAGE}" = false ]; then
usage
fi
if [ -z "${GIT_REPO}" ]; then
GIT_REPO="${DEFAULT_REPO}"
fi
fi

if [ -z "${GIT_REPO}" ]; then
GIT_REPO="${DEFAULT_REPO}"
fi

# We need a place to build
if ! BUILD_DIR=$(mktemp -d -t "router-build.XXXXXXXXXX"); then
Expand Down Expand Up @@ -150,7 +150,7 @@ if [ "${BUILD_IMAGE}" = true ]; then
ROUTER_VERSION=$(git rev-parse HEAD)
fi
# Let the user know what we are going to do
echo "Building image: ${ROUTER_VERSION}" from repo""
echo "Building image: ${ROUTER_VERSION}" from repo: ${GIT_REPO}""
git checkout "${ROUTER_VERSION}" > /dev/null 2>&1 || terminate "Couldn't checkout ${ROUTER_VERSION}"
# Build our docker images
docker build -q -t "router:${ROUTER_VERSION}" \
Expand Down