From fea1f7e6b721ad7d9b44d3ead956d531b2807ff9 Mon Sep 17 00:00:00 2001 From: hackerman <3372410+aeneasr@users.noreply.github.com> Date: Sat, 11 Jan 2025 13:31:34 +0100 Subject: [PATCH] Revert "Revert "chore: synchronize workspaces"" This reverts commit 075af5f9ee747db97860271cf9ac380c1446b708. --- .docker/README.md | 7 +++++-- README.md | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.docker/README.md b/.docker/README.md index 87205770ac9..04d148002f5 100644 --- a/.docker/README.md +++ b/.docker/README.md @@ -1,3 +1,6 @@ This directory contains Dockerfiles for various targets: -- `Dockerfile-distroless` and `Dockerfile-alpine` are published to Docker Hub via GoReleaser. -- The other `Dockerfile` variants are intended only for local development and tests. + +- `Dockerfile-distroless` and `Dockerfile-alpine` are published to Docker Hub + via GoReleaser. +- The other `Dockerfile` variants are intended only for local development and + tests. diff --git a/README.md b/README.md index 15a75795905..52c2cf6c01c 100644 --- a/README.md +++ b/README.md @@ -982,8 +982,11 @@ quickstart files, run: docker compose -f quickstart.yml up --build # .... ``` -Warning, this will override your local image tag with the latest build and can -lead to unexpected or confusing behavior. +> [!WARNING] If you already have a production image (e.g. `oryd/hydra:v2.2.0`) +> pulled, the above `make docker` command will replace it with a local build of +> the image that is more equivalent to the `-distroless` variant on Docker Hub. +> +> You can pull the production image any time using `docker pull` #### Add a new migration