Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,19 +139,21 @@ jobs:
needs: release
runs-on: ubuntu-latest

permissions: {}
permissions:
packages: write

steps:
- uses: actions/checkout@v6
with:
ref: ${{ needs.release.outputs.tag }}
persist-credentials: false

- name: Login to DockerHub
- name: Login to GHCR
uses: docker/login-action@v4
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v4
Expand Down
12 changes: 6 additions & 6 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ target "vws" {
inherits = ["_base"]
target = "vws"
tags = [
"adamtheturtle/vuforia-vws-mock:latest",
"adamtheturtle/vuforia-vws-mock:${VERSION}",
"ghcr.io/vws-python/vuforia-vws-mock:latest",
"ghcr.io/vws-python/vuforia-vws-mock:${VERSION}",
]
}

target "vwq" {
inherits = ["_base"]
target = "vwq"
tags = [
"adamtheturtle/vuforia-vwq-mock:latest",
"adamtheturtle/vuforia-vwq-mock:${VERSION}",
"ghcr.io/vws-python/vuforia-vwq-mock:latest",
"ghcr.io/vws-python/vuforia-vwq-mock:${VERSION}",
]
}

target "target-manager" {
inherits = ["_base"]
target = "target-manager"
tags = [
"adamtheturtle/vuforia-target-manager-mock:latest",
"adamtheturtle/vuforia-target-manager-mock:${VERSION}",
"ghcr.io/vws-python/vuforia-target-manager-mock:latest",
"ghcr.io/vws-python/vuforia-target-manager-mock:${VERSION}",
]
}
12 changes: 6 additions & 6 deletions docs/source/docker.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@ Creating containers
--publish 5005:5000 \
--name vuforia-target-manager-mock \
--network vws-bridge-network \
adamtheturtle/vuforia-target-manager-mock
ghcr.io/vws-python/vuforia-target-manager-mock
$ docker run \
--detach \
--publish 5006:5000 \
-e TARGET_MANAGER_BACKEND=vuforia-target-manager-mock:5000 \
--network vws-bridge-network \
adamtheturtle/vuforia-vws-mock
ghcr.io/vws-python/vuforia-vws-mock
$ docker run \
--detach \
--publish 5007:5000 \
-e TARGET_MANAGER_BACKEND=vuforia-target-manager-mock:5000 \
--network vws-bridge-network \
adamtheturtle/vuforia-vwq-mock
ghcr.io/vws-python/vuforia-vwq-mock


Adding a database to the mock target manager
Expand Down Expand Up @@ -157,9 +157,9 @@ Building images from source
$ export REPOSITORY_ROOT="$PWD"
$ export DOCKERFILE="$REPOSITORY_ROOT/src/mock_vws/_flask_server/Dockerfile"

$ export TARGET_MANAGER_TAG=adamtheturtle/vuforia-target-manager-mock:latest
$ export VWS_TAG=adamtheturtle/vuforia-vws-mock:latest
$ export VWQ_TAG=adamtheturtle/vuforia-vwq-mock:latest
$ export TARGET_MANAGER_TAG=ghcr.io/vws-python/vuforia-target-manager-mock:latest
$ export VWS_TAG=ghcr.io/vws-python/vuforia-vws-mock:latest
$ export VWQ_TAG=ghcr.io/vws-python/vuforia-vwq-mock:latest

$ docker buildx build "$REPOSITORY_ROOT" --file "$DOCKERFILE" --target target-manager --tag "$TARGET_MANAGER_TAG"
$ docker buildx build "$REPOSITORY_ROOT" --file "$DOCKERFILE" --target vws --tag "$VWS_TAG"
Expand Down
Loading