diff --git a/.github/workflows/build-and-sign-container.yml b/.github/workflows/build-and-sign-container.yml index ad15173..fde1935 100644 --- a/.github/workflows/build-and-sign-container.yml +++ b/.github/workflows/build-and-sign-container.yml @@ -19,10 +19,10 @@ jobs: include: - target: cli suffix: "" - publish_latest: true + latest_tag: "latest" - target: enterprise suffix: "-enterprise" - publish_latest: false + latest_tag: "latest-enterprise" env: DOCKER_REGISTRY: ${{ vars.DOCKER_REGISTRY }} DOCKER_REPOSITORY: ${{ vars.DOCKER_REPOSITORY }} @@ -57,8 +57,8 @@ jobs: run: | TAGS="${{ steps.image-ref.outputs.version_tag }}" - if [ "${{ matrix.publish_latest }}" = "true" ]; then - TAGS="${TAGS}"$'\n'"${DOCKER_REGISTRY}/${DOCKER_REPOSITORY}:latest" + if [ -n "${{ matrix.latest_tag }}" ]; then + TAGS="${TAGS}"$'\n'"${DOCKER_REGISTRY}/${DOCKER_REPOSITORY}:${{ matrix.latest_tag }}" fi { diff --git a/deployments/helm/openhound/README.md b/deployments/helm/openhound/README.md index cda77dc..a62a8d4 100644 --- a/deployments/helm/openhound/README.md +++ b/deployments/helm/openhound/README.md @@ -26,7 +26,7 @@ helm install -f values.yml openhound- ./deployments/helm/openhound # Example values for the JAMF collector image: repository: docker.io/specterops/openhound - tag: "0.1.1-enterprise" + tag: "latest-enterprise" # Optional environment variables. env: diff --git a/deployments/helm/values.example.yaml b/deployments/helm/values.example.yaml index 2966be0..c24097b 100644 --- a/deployments/helm/values.example.yaml +++ b/deployments/helm/values.example.yaml @@ -1,7 +1,7 @@ # Example values for the JAMF collector image: repository: docker.io/specterops/openhound - tag: "0.1.1-enterprise" + tag: "latest-enterprise" # Optional environment variables. env: diff --git a/example-configurations/bloodhound-enterprise/README.md b/example-configurations/bloodhound-enterprise/README.md index 7b487e5..7fce267 100644 --- a/example-configurations/bloodhound-enterprise/README.md +++ b/example-configurations/bloodhound-enterprise/README.md @@ -3,7 +3,7 @@ 1. Copy `.dlt-example` to `${HOME}/.dlt`and `docker-compose.yml` to `${HOME}`. 2. Fill in your credentials in the toml files. 3. Place any required key files (github.pem, okta.json) in `${HOME}/.dlt`. - 4. Pull image from SpecterOps Docker Hub: `docker pull specterops/openhound:0.1.1-enterprise` + 4. Pull image from SpecterOps Docker Hub: `docker pull specterops/openhound:latest-enterprise` or run to pull from docker-compose.yml: `docker compose pull` 5. Run all collectors: `docker compose up -d` or run a single one: `docker compose up -d scheduler-jamf` diff --git a/example-configurations/bloodhound-enterprise/docker-compose.yml b/example-configurations/bloodhound-enterprise/docker-compose.yml index b20b9cc..b489a12 100644 --- a/example-configurations/bloodhound-enterprise/docker-compose.yml +++ b/example-configurations/bloodhound-enterprise/docker-compose.yml @@ -1,5 +1,5 @@ x-scheduler: &scheduler - image: specterops/openhound:${IMAGE_VERSION:-0.1.1-enterprise} + image: specterops/openhound:${IMAGE_VERSION:latest-enterprise} restart: unless-stopped init: true volumes: