Skip to content
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

Jump to bottom

change DOCKER_REGISTRY to CHEETAH_DOCKER_REGISTRY #47

Merged
merged 2 commits into from
Jan 4, 2024
Merged

change DOCKER_REGISTRY to CHEETAH_DOCKER_REGISTRY #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6919c1
change DOCKER_REGISTRY to CHEETAH_DOCKER_REGISTRY
pegtrifork Jan 4, 2024
8047e47
change DOCKER_REGISTRY to CHEETAH_DOCKER_REGISTRY
pegtrifork Jan 4, 2024
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
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DOCKER_REGISTRY=ghcr.io/trifork/
CHEETAH_DOCKER_REGISTRY=ghcr.io/trifork/
COMPOSE_PROJECT_NAME=cheetah-infrastructure
COMPOSE_PATH_SEPARATOR=:
COMPOSE_FILE=docker-compose.yaml:docker-compose/kafka.yaml:docker-compose/os.yaml:docker-compose/oauth.yaml:docker-compose/observability.yaml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: E2E

on:

Check warning on line 4 in .github/workflows/e2e.yaml

View workflow job for this annotation

GitHub Actions / MegaLinter 

4:1 [truthy] truthy value should be one of [false, true]
workflow_call:
workflow_dispatch:
schedule:
Expand All @@ -17,7 +17,7 @@
cancel-in-progress: true

env:
DOCKER_REGISTRY: ghcr.io/trifork/
CHEETAH_DOCKER_REGISTRY: ghcr.io/trifork/

jobs:
should-run:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/kafka.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
- full

kafka:
image: ${DOCKER_REGISTRY-}cheetah-infrastructure-utils-kafka:strimzi-0.38.0-kafka-3.6.0-trifork-1.5.0
image: ${CHEETAH_DOCKER_REGISTRY-}cheetah-infrastructure-utils-kafka:strimzi-0.38.0-kafka-3.6.0-trifork-1.5.0
platform: linux/amd64
hostname: kafka
mem_limit: 1024m
Expand Down
4 changes: 2 additions & 2 deletions docker-compose/oauth.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
hostname: cheetahoauthsimulator
ports:
- "1752:80"
image: ${DOCKER_REGISTRY-}cheetah-oauth-simulator:1.7.2
image: ${CHEETAH_DOCKER_REGISTRY-}cheetah-oauth-simulator:1.7.2
platform: linux/amd64
restart: unless-stopped
environment:
Expand All @@ -24,7 +24,7 @@ services:
hostname: cheetahoauthsimulator
ports:
- "1852:1852"
image: ${DOCKER_REGISTRY-}cheetah-oauth-simulator:1.7.2
image: ${CHEETAH_DOCKER_REGISTRY-}cheetah-oauth-simulator:1.7.2
platform: linux/amd64
environment:
- ASPNETCORE_ENVIRONMENT=Development
Expand Down
4 changes: 2 additions & 2 deletions docker-compose/os.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
# login fallback: admin:admin
# services should use oauth
opensearch:
image: ${DOCKER_REGISTRY-}cheetah-infrastructure-opensearch:0.5.0
image: ${CHEETAH_DOCKER_REGISTRY-}cheetah-infrastructure-opensearch:0.5.0
hostname: opensearch
environment:
- cluster.name=opensearch-cluster
Expand Down Expand Up @@ -53,7 +53,7 @@ services:
retries: 5

opensearch-configurer:
image: ${DOCKER_REGISTRY-}cheetah-infrastructure-utils-os:0.5.0
image: ${CHEETAH_DOCKER_REGISTRY-}cheetah-infrastructure-utils-os:0.5.0
command: "opensearch:9200 --service"
environment:
- OS_USER=admin
Expand Down
Loading