diff --git a/.github/workflows/observability-docker.yml b/.github/workflows/observability-docker.yml index 8a7b7b3..04e8fe4 100644 --- a/.github/workflows/observability-docker.yml +++ b/.github/workflows/observability-docker.yml @@ -33,32 +33,32 @@ jobs: - name: Checkout branch uses: actions/checkout@v4 - # - name: Login to DockerHub - # uses: docker/login-action@v3 - # with: - # username: ${{ secrets.DOCKERHUB_USERNAME }} - # password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Login to DockerHub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - # - name: Extract metadata (tags, labels) for Docker - # id: meta - # uses: docker/metadata-action@v5 - # with: - # images: ${{ matrix.image }} - # tags: | - # # set latest tag for default branch - # type=raw,value=latest,enable={{is_default_branch}} - # # Include all default tags - # type=schedule - # type=ref,event=branch - # type=ref,event=tag - # type=ref,event=pr - # type=sha - # - name: Build and push Docker image - # id: push - # uses: docker/build-push-action@v6 - # with: - # context: ${{ matrix.context }} - # file: ${{ matrix.dockerfile }} - # push: true - # tags: ${{ steps.meta.outputs.tags }} - # labels: ${{ steps.meta.outputs.labels }} + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ matrix.image }} + tags: | + # set latest tag for default branch + type=raw,value=latest,enable={{is_default_branch}} + # Include all default tags + type=schedule + type=ref,event=branch + type=ref,event=tag + type=ref,event=pr + type=sha + - name: Build and push Docker image + id: push + uses: docker/build-push-action@v6 + with: + context: ${{ matrix.context }} + file: ${{ matrix.dockerfile }} + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/observability/grafana/Dockerfile b/observability/grafana/Dockerfile index 0c7ac34..0dc0bc5 100644 --- a/observability/grafana/Dockerfile +++ b/observability/grafana/Dockerfile @@ -5,6 +5,8 @@ LABEL traefik.enable="true" \ traefik.http.middlewares.grafana-stripprefix.stripprefix.prefixes="/grafana" \ traefik.http.routers.grafana-path-router.middlewares="grafana-stripprefix@docker" +RUN mkdir -p /etc/grafana/provisioning/dashboards/site + COPY ./provisioning /etc/grafana/provisioning ENV GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH=/etc/grafana/provisioning/dashboards/default/cogstack/cogstack-availability.json \ diff --git a/observability/traefik/Dockerfile b/observability/traefik/Dockerfile index df922cc..cf299a5 100644 --- a/observability/traefik/Dockerfile +++ b/observability/traefik/Dockerfile @@ -1,7 +1,5 @@ FROM traefik:v3.4 -COPY ./config /etc/traefik/config - CMD [ \ "--api.insecure=true", \ "--providers.docker", \