Skip to content

Commit

Permalink
Update dockerfiles for development
Browse files Browse the repository at this point in the history
Signed-off-by: Nicolas Bock <[email protected]>
  • Loading branch information
nicolasbock committed Sep 12, 2024
1 parent 2286294 commit 0593127
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
all: lint build test install

.PHONY: docker-compose
docker-compose:
docker-compose: docker-build
if docker-compose version > /dev/null 2>&1; then \
DOCKER_COMPOSE="docker-compose"; \
else \
Expand Down
2 changes: 1 addition & 1 deletion cmd/monitor/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM ubuntu:24.04
LABEL maintainer="Canonical Sustaining Engineering <edward.hope-morley@canonical.com>"
LABEL maintainer="Canonical Sustaining Engineering <nicolas.bock@canonical.com>"
LABEL org.opencontainers.image.description "Athena Monitor"

RUN apt-get update
Expand Down
2 changes: 1 addition & 1 deletion cmd/processor/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM ubuntu:24.04
LABEL maintainer="Canonical Sustaining Engineering <edward.hope-morley@canonical.com>"
LABEL maintainer="Canonical Sustaining Engineering <nicolas.bock@canonical.com>"
LABEL org.opencontainers.image.description "Athena Processor"

RUN apt-get update
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:

athena-monitor:
container_name: athena-monitor
image: ghcr.io/canonical/athena-core/athena-monitor:${BRANCH:-main}
image: athena/athena-monitor:${BRANCH:-main}
volumes:
- ./creds-athena.yaml:/etc/athena/main.yaml
- ./athena-monitor.yaml:/etc/athena/monitor.yaml
Expand All @@ -37,7 +37,7 @@ services:

athena-processor:
container_name: athena-processor
image: ghcr.io/canonical/athena-core/athena-processor:${BRANCH:-main}
image: athena/athena-processor:${BRANCH:-main}
volumes:
- ./creds-athena.yaml:/etc/athena/main.yaml
- ./athena-processor.yaml:/etc/athena/processor.yaml
Expand Down

0 comments on commit 0593127

Please sign in to comment.