diff --git a/Makefile b/Makefile index c567302..5c22f57 100644 --- a/Makefile +++ b/Makefile @@ -3,9 +3,6 @@ build: clean go build . -run-tools: - docker compose -f docker-compose.tools.yml up -d - build-monitord: go build -o ../oc-monitord ../oc-monitord @@ -16,7 +13,7 @@ clean: rm -rf oc-schedulerd docker: - DOCKER_BUILDKIT=1 docker build -t oc/oc-schedulerd:0.0.1 -f Dockerfile . --build-arg MONITORD_IMAGE=oc/oc-monitord + DOCKER_BUILDKIT=1 docker build -t oc/oc-schedulerd:0.0.1 --build-arg MONITORD_IMAGE=oc/oc-monitord -f Dockerfile . docker tag oc/oc-schedulerd:0.0.1 oc/oc-schedulerd:latest publish-kind: @@ -27,6 +24,6 @@ publish-registry: all: docker publish-kind publish-registry -dev: run-tools build-monitord build run +dev: build-monitord build run .PHONY: build run clean docker publish-kind publish-registry \ No newline at end of file diff --git a/docker-compose.tools.yml b/docker-compose.tools.yml deleted file mode 100644 index 0e6b9dd..0000000 --- a/docker-compose.tools.yml +++ /dev/null @@ -1,52 +0,0 @@ -version: '3.4' - -services: - nats: - image: 'nats:latest' - container_name: nats - ports: - - 4222:4222 - command: - - "--debug" - networks: - - catalog - loki: - image: 'grafana/loki' - container_name: loki - labels: - - "traefik.enable=true" - - "traefik.http.routers.loki.entrypoints=web" - - "traefik.http.routers.loki.rule=PathPrefix(`/tools/loki`)" - - "traefik.http.services.loki.loadbalancer.server.port=3100" - - "traefik.http.middlewares.loki-stripprefix.stripprefix.prefixes=/tools/loki" - - "traefik.http.routers.loki.middlewares=loki-stripprefix" - - "traefik.http.middlewares.loki.forwardauth.address=http://oc-auth:8080/oc/forward" - ports : - - "3100:3100" - networks: - - catalog - grafana: - image: 'grafana/grafana' - container_name: grafana - ports: - - '3000:3000' - labels: - - "traefik.enable=true" - - "traefik.http.routers.grafana.entrypoints=web" - - "traefik.http.routers.grafana.rule=PathPrefix(`/tools/grafana`)" - - "traefik.http.services.grafana.loadbalancer.server.port=3000" - - "traefik.http.middlewares.grafana-stripprefix.stripprefix.prefixes=/tools/grafana" - - "traefik.http.routers.grafana.middlewares=grafana-stripprefix" - - "traefik.http.middlewares.grafana.forwardauth.address=http://oc-auth:8080/oc/forward" - networks: - - catalog - volumes: - - ./conf/grafana_data_source.yml:/etc/grafana/provisioning/datasources/datasource.yml - environment: - - GF_SECURITY_ADMIN_PASSWORD=pfnirt # Change this to anything but admin to not have a password change page at startup - - GF_SECURITY_ADMIN_USER=admin - - GF_SECURITY_DISABLE_INITIAL_ADMIN_PASSWORD_CHANGE=true - -networks: - catalog: - external: true diff --git a/docker-compose.yml b/docker-compose.yml index 2407c4a..c03d76b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,8 +12,8 @@ services: - 9001:8080 container_name: oc-schedulerd networks: - - catalog + - oc networks: - catalog: + oc: external: true \ No newline at end of file