Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dockerfiles for development #193

Merged
merged 1 commit into from
Sep 12, 2024
Merged

Update dockerfiles for development #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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.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.yaml:/etc/athena/main.yaml
- ./athena-processor.yaml:/etc/athena/processor.yaml
Expand Down
Loading