From df443a7d3a44b10a25f89ad1dba4ca043a6bb2e3 Mon Sep 17 00:00:00 2001 From: alhendrickson <159636032+alhendrickson@users.noreply.github.com.> Date: Wed, 28 May 2025 15:22:40 +0100 Subject: [PATCH 1/6] Setup docker build in CI --- .github/workflows/observability-docker.yml | 58 +++++++++++----------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/.github/workflows/observability-docker.yml b/.github/workflows/observability-docker.yml index 8a7b7b3..1fe4ba1 100644 --- a/.github/workflows/observability-docker.yml +++ b/.github/workflows/observability-docker.yml @@ -30,35 +30,33 @@ jobs: dockerfile: observability/traefik/Dockerfile image: cogstacksystems/cogstack-observability-traefik steps: - - 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 }} From 7baf61674ef6a211de1b03a3d921e11b7cf9259e Mon Sep 17 00:00:00 2001 From: alhendrickson <159636032+alhendrickson@users.noreply.github.com.> Date: Wed, 28 May 2025 15:23:16 +0100 Subject: [PATCH 2/6] Setup docker build in CI --- .github/workflows/observability-docker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/observability-docker.yml b/.github/workflows/observability-docker.yml index 1fe4ba1..04e8fe4 100644 --- a/.github/workflows/observability-docker.yml +++ b/.github/workflows/observability-docker.yml @@ -30,6 +30,8 @@ jobs: dockerfile: observability/traefik/Dockerfile image: cogstacksystems/cogstack-observability-traefik steps: + - name: Checkout branch + uses: actions/checkout@v4 - name: Login to DockerHub uses: docker/login-action@v3 From 9a99a117eb2e199ea96c8db9b1f009e0dad5b0ea Mon Sep 17 00:00:00 2001 From: alhendrickson <159636032+alhendrickson@users.noreply.github.com.> Date: Wed, 28 May 2025 15:25:55 +0100 Subject: [PATCH 3/6] Setup docker build in CI --- observability/traefik/Dockerfile | 2 -- 1 file changed, 2 deletions(-) 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", \ From 34c0e13ab0abc95af78a89ba792926ac69a4e9b6 Mon Sep 17 00:00:00 2001 From: alhendrickson <159636032+alhendrickson@users.noreply.github.com.> Date: Wed, 28 May 2025 15:36:25 +0100 Subject: [PATCH 4/6] Setup grafana dir --- observability/grafana/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/observability/grafana/Dockerfile b/observability/grafana/Dockerfile index 0c7ac34..34eb701 100644 --- a/observability/grafana/Dockerfile +++ b/observability/grafana/Dockerfile @@ -7,6 +7,8 @@ LABEL traefik.enable="true" \ COPY ./provisioning /etc/grafana/provisioning +RUN mkdir -p /etc/grafana/provisioning/site + ENV GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH=/etc/grafana/provisioning/dashboards/default/cogstack/cogstack-availability.json \ GF_USERS_ALLOW_SIGN_UP=false \ GF_SERVER_ROOT_URL="%(protocol)s://%(domain)s:%(http_port)s/grafana" \ From 0cf04000e5b9eeb7ca580b77534fe4858ee909e3 Mon Sep 17 00:00:00 2001 From: alhendrickson <159636032+alhendrickson@users.noreply.github.com.> Date: Wed, 28 May 2025 15:39:10 +0100 Subject: [PATCH 5/6] Setup grafana dir --- observability/grafana/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observability/grafana/Dockerfile b/observability/grafana/Dockerfile index 34eb701..e474ea6 100644 --- a/observability/grafana/Dockerfile +++ b/observability/grafana/Dockerfile @@ -7,7 +7,7 @@ LABEL traefik.enable="true" \ COPY ./provisioning /etc/grafana/provisioning -RUN mkdir -p /etc/grafana/provisioning/site +RUN mkdir -p /etc/grafana/provisioning/dashboards/site ENV GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH=/etc/grafana/provisioning/dashboards/default/cogstack/cogstack-availability.json \ GF_USERS_ALLOW_SIGN_UP=false \ From feea61f8f530859c679a5db502884067bb2a1faf Mon Sep 17 00:00:00 2001 From: alhendrickson <159636032+alhendrickson@users.noreply.github.com.> Date: Wed, 28 May 2025 15:41:34 +0100 Subject: [PATCH 6/6] Setup grafana dir --- observability/grafana/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/observability/grafana/Dockerfile b/observability/grafana/Dockerfile index e474ea6..0dc0bc5 100644 --- a/observability/grafana/Dockerfile +++ b/observability/grafana/Dockerfile @@ -5,10 +5,10 @@ LABEL traefik.enable="true" \ traefik.http.middlewares.grafana-stripprefix.stripprefix.prefixes="/grafana" \ traefik.http.routers.grafana-path-router.middlewares="grafana-stripprefix@docker" -COPY ./provisioning /etc/grafana/provisioning - 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 \ GF_USERS_ALLOW_SIGN_UP=false \ GF_SERVER_ROOT_URL="%(protocol)s://%(domain)s:%(http_port)s/grafana" \