feat: merge dt and celery container builds (#6973)

* feat: merge dt and celery container builds * fix: mount /a instead of /assets * feat: use consolidated script * fix: get start.sh dependencies. Remove watchdog * fix: correct source path
ietf-tools · May 14, 2024 · ff228a5 · ff228a5
1 parent 661941d
commit ff228a5
Showing 1 changed file with 26 additions and 17 deletions.
diff --git a/dev/build/Dockerfile b/dev/build/Dockerfile
@@ -1,17 +1,26 @@
-FROM ghcr.io/ietf-tools/datatracker-app-base:latest
-LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-COPY . .
-COPY ./dev/build/start.sh ./start.sh
-RUN pip3 --disable-pip-version-check --no-cache-dir install -r requirements.txt
-RUN chmod +x start.sh && \
-    chmod +x docker/scripts/app-create-dirs.sh && \
-    sh ./docker/scripts/app-create-dirs.sh
-
-VOLUME [ "/assets" ]
-
-EXPOSE 8000
-
-CMD ["./start.sh"]
+FROM ghcr.io/ietf-tools/datatracker-app-base:latest
+LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get purge -y imagemagick imagemagick-6-common
+
+COPY . .
+COPY ./dev/build/start.sh ./start.sh
+COPY ./dev/build/datatracker-start.sh ./datatracker-start.sh
+COPY ./dev/build/celery-start.sh ./celery-start.sh
+
+RUN pip3 --disable-pip-version-check --no-cache-dir install -r requirements.txt
+
+RUN chmod +x datatracker-start.sh && \
+    chmod +x celery-start.sh \
+    chmod +x docker/scripts/app-create-dirs.sh && \
+    sh ./docker/scripts/app-create-dirs.sh
+
+RUN mkdir -p /a
+
+VOLUME [ "/a" ]
+
+EXPOSE 8000
+
+CMD ["./start.sh"]