Layered services images

UCL-INGI · Oct 21, 2022 · fe246b2 · fe246b2
1 parent c5f0072
commit fe246b2
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 33 deletions.
diff --git a/backend.containerfile b/backend.containerfile
diff --git a/agent-docker.containerfile → deploy/agent-docker.containerfile b/agent-docker.containerfile → deploy/agent-docker.containerfile
@@ -1,15 +1,10 @@
-FROM ubuntu:22.04
+FROM inginious/inginious-base
 
-RUN apt-get update && apt-get -y install python3 python3-pip
-
-WORKDIR /inginious
-COPY inginious/common/ inginious/common/
 COPY inginious/agent/__init__.py inginious/agent/
 COPY inginious/agent/docker_agent/ inginious/agent/docker_agent/
 COPY inginious-agent-docker .
 
-COPY agent-docker.setup setup.py
+COPY deploy/agent-docker.setup setup.py
 RUN pip3 install .
 
-
 CMD ["sh", "-c", "python3 inginious-agent-docker ${BACKEND}"]
diff --git a/agent-docker.setup → deploy/agent-docker.setup b/agent-docker.setup → deploy/agent-docker.setup
diff --git a/agent-mcq.containerfile → deploy/agent-mcq.containerfile b/agent-mcq.containerfile → deploy/agent-mcq.containerfile
@@ -1,15 +1,10 @@
-FROM ubuntu:22.04
+FROM inginious/inginious-base
 
-RUN apt-get update && apt-get -y install python3 python3-pip
-
-WORKDIR /inginious
-COPY inginious/common/ inginious/common/
-COPY inginious/__init__.py inginious/
 COPY inginious/agent/__init__.py inginious/agent/
 COPY inginious/agent/mcq_agent/ inginious/agent/mcq_agent/
 COPY inginious-agent-mcq .
 
-COPY agent-mcq.setup setup.py
+COPY deploy/agent-mcq.setup setup.py
 RUN pip3 install .
 
 CMD ["sh", "-c", "python3 inginious-agent-mcq ${BACKEND}"]
diff --git a/agent-mcq.setup → deploy/agent-mcq.setup b/agent-mcq.setup → deploy/agent-mcq.setup
diff --git a/deploy/backend.containerfile b/deploy/backend.containerfile
@@ -0,0 +1,9 @@
+FROM inginious/inginious-base
+
+COPY inginious/backend/ inginious/backend/
+COPY inginious-backend .
+
+COPY deploy/backend.setup setup.py
+RUN pip3 install .
+
+CMD ["sh", "-c", "python3 inginious-backend ${AGENT} ${CLIENT}"]
diff --git a/backend.setup → deploy/backend.setup b/backend.setup → deploy/backend.setup
diff --git a/deploy/inginious-base.containerfile b/deploy/inginious-base.containerfile
@@ -0,0 +1,7 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && apt-get -y install python3 python3-pip
+
+WORKDIR /inginious
+COPY inginious/common/ inginious/common/
+COPY inginious/__init__.py inginious/
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,23 +6,23 @@ services:
       - inginious
 
   inginious-backend:
-    image: inginious-backend
+    image: inginious/inginious-backend
     build:
-      dockerfile: backend.containerfile
+      dockerfile: deploy/backend.containerfile
     environment:
       AGENT: "tcp://0.0.0.0:2001"
       CLIENT: "tcp://0.0.0.0:2000"
     networks:
       - inginious
 
   inginious-agent-docker:
-    image: inginious-agent-docker
+    image: inginious/inginious-agent-docker
     depends_on:
       - inginious-backend
     deploy:
       replicas: 1
     build:
-      dockerfile: agent-docker.containerfile
+      dockerfile: deploy/agent-docker.containerfile
     environment:
       BACKEND: "tcp://inginious-backend:2001"
     volumes:
@@ -31,13 +31,13 @@ services:
       - inginious
 
   inginious-agent-mcq:
-    image: inginious-agent-mcq
+    image: inginious/inginious-agent-mcq
     depends_on:
       - inginious-backend
     deploy:
       replicas: 1
     build:
-      dockerfile: agent-mcq.containerfile
+      dockerfile: deploy/agent-mcq.containerfile
     environment:
       BACKEND: "tcp://inginious-backend:2001"
     networks: