Skip to content

Commit

Permalink
fixed Makefile, docker-compose, and Dockerfiles for postgres and prom…
Browse files Browse the repository at this point in the history
…etheus
  • Loading branch information
gschussler committed Aug 23, 2023
1 parent af0133f commit 2dba609
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ push-cadvisor: push-postgres
docker pull $(CADVISOR_IMAGE):$(CADVISOR_VER) && echo "Failure: Tag already exists" || docker buildx build --push --builder=$(BUILDER) --platform=linux/amd64,linux/arm64 --build-arg TAG=$(CADVISOR_VER) --tag=$(CADVISOR_IMAGE):$(CADVISOR_VER) -f $(CADVISOR_DOCKERFILE_PATH) .

push-postgres: prepare-buildx
docker pull $(CADVISOR_IMAGE):$(CADVISOR_VER) && echo "Failure: Tag already exists" || docker buildx build --push --builder=$(BUILDER) --platform=linux/amd64,linux/arm64 --build-arg TAG=$(CADVISOR_VER) --tag=$(CADVISOR_IMAGE):$(CADVISOR_VER) -f $(CADVISOR_DOCKERFILE_PATH) .
docker pull $(POSTRGRES_IMAGE):$(POSTGRES_VER) && echo "Failure: Tag already exists" || docker buildx build --push --builder=$(BUILDER) --platform=linux/amd64,linux/arm64 --build-arg TAG=$(POSTGRES_VER) --tag=$(POSTGRES_IMAGE):$(POSTGRES_VER) -f $(POSTGRES_DOCKERFILE_PATH) .


help: ## Show this help
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ services:
- prometheus

docketeer:
image: docketeerxiv/docketeer:latest
image: docketeerxiv/docketeer:14.0.0
container_name: docketeer
ports:
- '4000:4000'
Expand Down
2 changes: 1 addition & 1 deletion imageConfigs/postgres/Dockerfile.postgres
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM postgres:latest

COPY ./init.sql /docker-entrypoint-initdb.d/init.sql
COPY imageConfigs/postgres/init.sql /docker-entrypoint-initdb.d/init.sql
2 changes: 1 addition & 1 deletion imageConfigs/prometheus/Dockerfile.prom
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM prom/prometheus:latest

COPY prometheus.yml /etc/prometheus/prometheus.yml
COPY imageConfigs/prometheus/prometheus.yml /etc/prometheus/prometheus.yml

CMD [ "--config.file=/etc/prometheus/prometheus.yml" ]

0 comments on commit 2dba609

Please sign in to comment.