From c94e2f4876c282d8e74bdcb37b23d79995a411d5 Mon Sep 17 00:00:00 2001 From: "Dr. Ernie Prabhakar" Date: Sat, 17 Aug 2024 19:56:54 -0700 Subject: [PATCH] ARCH = amd64 --- Dockerfile | 4 ++-- Makefile | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 81439bc..2498fe2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,7 @@ RUN ls -R ./ # Only needed if you, e.g., install a script # RUN poetry install --without dev -ENTRYPOINT ["poetry", "run", "python", "-m", "example.handler.sample_handler"] +# ENTRYPOINT ["poetry", "run", "python", "-m", "example.handler.sample_handler"] # CMD [ "example.handler.sample_handler" ] -# ENTRYPOINT ["poetry", "run", "python", "-m", "athena_federation.sample_handler"] +ENTRYPOINT ["poetry", "run", "python", "-m", "athena_federation.main"] diff --git a/Makefile b/Makefile index 0cd0873..a6d83b8 100644 --- a/Makefile +++ b/Makefile @@ -5,11 +5,13 @@ # PROJ = athena_federation -IMG = local/athena-federation +CONTAINER = athena-federation +VERSION = $(shell poetry version | cut -d' ' -f2) +IMG = local/$(CONTAINER):$(VERSION) CLIENT_PORT = 9000 SERVER_PORT = 8080 PORTMAP = -p $(CLIENT_PORT):$(SERVER_PORT) -ARCH = $(shell uname -m) +ARCH = amd64 # force to standard platform PLAT = --platform=linux/$(ARCH) BUILD = image build $(PLAT) RUN = container run $(PLAT) @@ -67,7 +69,7 @@ docker-status: # Build Docker image docker-build: docker $(BUILD) -t $(IMG) . - docker images | grep $(IMG) + docker images | grep $(CONTAINER) docker-debug: docker $(BUILD) . --no-cache --build-arg DEBUG=true