Skip to content

Commit 7b9a1c5

Browse files
committed
Remove mentions of docker-merge-tags in docs
1 parent f8879d9 commit 7b9a1c5

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

.github/workflows/docker.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ on:
1515
# We use local reusable workflows to make architecture clean and simple
1616
# https://docs.github.com/en/actions/sharing-automations/reusing-workflows
1717
- ".github/workflows/docker-build-test-upload.yml"
18-
- ".github/workflows/docker-merge-tags.yml"
1918
- ".github/workflows/docker-tag-push.yml"
2019
- ".github/workflows/docker-wiki-update.yml"
2120

@@ -39,7 +38,6 @@ on:
3938
paths:
4039
- ".github/workflows/docker.yml"
4140
- ".github/workflows/docker-build-test-upload.yml"
42-
- ".github/workflows/docker-merge-tags.yml"
4341
- ".github/workflows/docker-tag-push.yml"
4442
- ".github/workflows/docker-wiki-update.yml"
4543

docs/using/custom-images.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ Our repository provides several customization points:
1919
- `PYTHON_VERSION` (docker argument) - the Python version to install in `docker-stacks-foundation` image
2020
- `REGISTRY`, `OWNER`, `BASE_IMAGE` (docker arguments) - they allow to specify parent image for all the other images
2121
- `REGISTRY`, `OWNER` (part of `env` in some GitHub workflows) - these allow to properly tag and refer to images during following steps:
22-
[`build-test-upload`](https://github.com/jupyter/docker-stacks/blob/main/.github/workflows/docker-build-test-upload.yml),
23-
[`tag-push`](https://github.com/jupyter/docker-stacks/blob/main/.github/workflows/docker-tag-push.yml) and
24-
[`merge-tags`](https://github.com/jupyter/docker-stacks/blob/main/.github/workflows/docker-merge-tags.yml)
22+
- [`build-test-upload`](https://github.com/jupyter/docker-stacks/blob/main/.github/workflows/docker-build-test-upload.yml)
23+
- [`tag-push`](https://github.com/jupyter/docker-stacks/blob/main/.github/workflows/docker-tag-push.yml)
2524

2625
These customization points can't be changed during runtime.
2726
Read more about [Docker build arguments](https://docs.docker.com/build/building/variables/#arg-usage-example) and [GitHub environment variables for a single workflow](https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/store-information-in-variables#defining-environment-variables-for-a-single-workflow).

0 commit comments

Comments
 (0)