diff options
| author | MatthieuCoder <matthieu@matthieu-dev.xyz> | 2023-01-20 21:37:17 +0400 |
|---|---|---|
| committer | MatthieuCoder <matthieu@matthieu-dev.xyz> | 2023-01-20 21:37:17 +0400 |
| commit | 2a4f38aa4597a0e7979b38c4b5060c779cde221b (patch) | |
| tree | 357d22917176acbc74245a5450afebd5c468e061 | |
| parent | 88c054d53ec331e6760e5a1cc03ce4fd71f556dc (diff) | |
add tag per architecture
| -rw-r--r-- | .env | 12 | ||||
| -rw-r--r-- | .github/workflows/docker-publish.yml | 6 | ||||
| -rw-r--r-- | docker-compose.yaml | 46 |
3 files changed, 12 insertions, 52 deletions
@@ -1,11 +1 @@ -GRAFANA_SERVICE_PORT=3000 -GRAFANA_SERVICE_HOST=grafana - -# Jaeger -JAEGER_SERVICE_PORT=16686 -JAEGER_SERVICE_HOST=jaeger - -# Prometheus -PROMETHEUS_SERVICE_PORT=9090 -PROMETHEUS_SERVICE_HOST=prometheus -PROMETHEUS_ADDR=${PROMETHEUS_SERVICE_HOST}:${PROMETHEUS_SERVICE_PORT}
\ No newline at end of file +TAG=amd64 diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index acaf9eb..93f4eaf 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -37,7 +37,11 @@ jobs: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - + - name: Create tag + run: | + export TAG="${{ matrix.platform }}" + export TAG=${TAG/linux\//} + echo ${TAG//\//-} > .env - name: Build and push uses: docker/bake-action@v2 with: diff --git a/docker-compose.yaml b/docker-compose.yaml index c99ab20..6147bd3 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -14,16 +14,10 @@ services: mock: image: nginx cache: - image: ghcr.io/discordnova/nova/cache + image: ghcr.io/discordnova/nova/cache:${TAG:-latest} restart: always build: context: . - x-bake: - platforms: - - linux/amd64 - - linux/arm64/v8 - - linux/arm/v7 - args: - COMPONENT=cache volumes: @@ -36,18 +30,12 @@ services: - otelcol gateway: - image: ghcr.io/discordnova/nova/gateway + image: ghcr.io/discordnova/nova/gateway:${TAG:-latest} restart: always build: context: . args: - COMPONENT=gateway - x-bake: - platforms: - - linux/amd64 - - linux/arm64/v8 - - linux/arm/v7 - volumes: - ./config/default.yml:/config/default.yml environment: @@ -57,18 +45,12 @@ services: - otelcol rest: - image: ghcr.io/discordnova/nova/rest + image: ghcr.io/discordnova/nova/rest:${TAG:-latest} restart: always build: context: . args: - COMPONENT=rest - x-bake: - platforms: - - linux/amd64 - - linux/arm64/v8 - - linux/arm/v7 - volumes: - ./config/default.yml:/config/default.yml environment: @@ -81,19 +63,12 @@ services: - 8090:8090 webhook: - image: ghcr.io/discordnova/nova/webhook + image: ghcr.io/discordnova/nova/webhook:${TAG:-latest} restart: always build: context: . args: - - RUST_LOG=debug - COMPONENT=webhook - x-bake: - platforms: - - linux/amd64 - - linux/arm64/v8 - - linux/arm/v7 - volumes: - ./config/default.yml:/config/default.yml environment: @@ -105,18 +80,12 @@ services: - 9002:9000 - 8091:8091 ratelimit: - image: ghcr.io/discordnova/nova/ratelimit + image: ghcr.io/discordnova/nova/ratelimit:${TAG:-latest} restart: always build: context: . args: - COMPONENT=ratelimit - x-bake: - platforms: - - linux/amd64 - - linux/arm64/v8 - - linux/arm/v7 - volumes: - ./config/default.yml:/config/default.yml environment: @@ -144,7 +113,6 @@ services: memory: 275M restart: always ports: - - "${JAEGER_SERVICE_PORT}:${JAEGER_SERVICE_PORT}" # Jaeger UI - "4317" # OTLP gRPC default port environment: - COLLECTOR_OTLP_ENABLED=true @@ -158,7 +126,7 @@ services: - ./otel/grafana/grafana.ini:/etc/grafana/grafana.ini - ./otel/grafana/provisioning/:/etc/grafana/provisioning/ ports: - - "${GRAFANA_SERVICE_PORT}:${GRAFANA_SERVICE_PORT}" + - "3000:3000" # OpenTelemetry Collector otelcol: @@ -194,5 +162,3 @@ services: - --web.route-prefix=/ volumes: - ./otel/prometheus/prometheus-config.yaml:/etc/prometheus/prometheus-config.yaml - ports: - - "${PROMETHEUS_SERVICE_PORT}:${PROMETHEUS_SERVICE_PORT}" |