Skip to content

Commit ff228a5

Browse files
rjsparksNGPixel
authored andcommitted
feat: merge dt and celery container builds (ietf-tools#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
1 parent 661941d commit ff228a5

1 file changed

Lines changed: 26 additions & 17 deletions

File tree

dev/build/Dockerfile

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
1-
FROM ghcr.io/ietf-tools/datatracker-app-base:latest
2-
LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
3-
4-
ENV DEBIAN_FRONTEND=noninteractive
5-
6-
COPY . .
7-
COPY ./dev/build/start.sh ./start.sh
8-
RUN pip3 --disable-pip-version-check --no-cache-dir install -r requirements.txt
9-
RUN chmod +x start.sh && \
10-
chmod +x docker/scripts/app-create-dirs.sh && \
11-
sh ./docker/scripts/app-create-dirs.sh
12-
13-
VOLUME [ "/assets" ]
14-
15-
EXPOSE 8000
16-
17-
CMD ["./start.sh"]
1+
FROM ghcr.io/ietf-tools/datatracker-app-base:latest
2+
LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
3+
4+
ENV DEBIAN_FRONTEND=noninteractive
5+
6+
RUN apt-get purge -y imagemagick imagemagick-6-common
7+
8+
COPY . .
9+
COPY ./dev/build/start.sh ./start.sh
10+
COPY ./dev/build/datatracker-start.sh ./datatracker-start.sh
11+
COPY ./dev/build/celery-start.sh ./celery-start.sh
12+
13+
RUN pip3 --disable-pip-version-check --no-cache-dir install -r requirements.txt
14+
15+
RUN chmod +x datatracker-start.sh && \
16+
chmod +x celery-start.sh \
17+
chmod +x docker/scripts/app-create-dirs.sh && \
18+
sh ./docker/scripts/app-create-dirs.sh
19+
20+
RUN mkdir -p /a
21+
22+
VOLUME [ "/a" ]
23+
24+
EXPOSE 8000
25+
26+
CMD ["./start.sh"]

0 commit comments

Comments
 (0)