Skip to content

Commit 51f7765

Browse files
anthony-chaudharyanthony-chaudhary
committed
Remove new relic to avoid confusion
We want to be sure we only have one place to change docker files If we need to tag or enable something for new relic it should be a variable or something else. Clean commented out code
1 parent 7797622 commit 51f7765

8 files changed

Lines changed: 14 additions & 112 deletions

File tree

‎.github/workflows/publish_docker_images.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ jobs:
7171
docker tag diffgram/default diffgram/default:${{ env.diffgram_version }}
7272
docker push diffgram/default
7373
74-
docker build . -t diffgram/default -f default/Dockerfile.newrelic
75-
docker tag diffgram/default diffgram/default:newrelic-${{ env.diffgram_version }}
74+
docker build . -t diffgram/default -f default/Dockerfile
75+
docker tag diffgram/default diffgram/default:${{ env.diffgram_version }}
7676
docker push diffgram/default --all-tags
7777
7878
Publish-Eventhandlers-Docker-Image:
@@ -132,8 +132,8 @@ jobs:
132132
docker tag diffgram/eventhandlers diffgram/eventhandlers:${{ env.diffgram_version }}
133133
docker push diffgram/eventhandlers
134134
135-
docker build . -t diffgram/eventhandlers -f eventhandlers/Dockerfile.newrelic
136-
docker tag diffgram/eventhandlers diffgram/eventhandlers:newrelic-${{ env.diffgram_version }}
135+
docker build . -t diffgram/eventhandlers -f eventhandlers/Dockerfile
136+
docker tag diffgram/eventhandlers diffgram/eventhandlers:${{ env.diffgram_version }}
137137
docker push diffgram/eventhandlers --all-tags
138138
139139
Publish-Walrus-Docker-Image:
@@ -192,8 +192,8 @@ jobs:
192192
docker push diffgram/walrus
193193
docker push diffgram/walrus:${{ env.diffgram_version }}
194194
195-
docker build . -t diffgram/walrus -f walrus/Dockerfile.newrelic
196-
docker tag diffgram/walrus diffgram/walrus:newrelic-${{ env.diffgram_version }}
195+
docker build . -t diffgram/walrus -f walrus/Dockerfile
196+
docker tag diffgram/walrus diffgram/walrus:${{ env.diffgram_version }}
197197
docker push diffgram/walrus --all-tags
198198
Publish-Frontend-Docker-Image:
199199
runs-on: ubuntu-latest
@@ -244,7 +244,7 @@ jobs:
244244
docker push diffgram/frontend
245245
246246
docker build . -t diffgram/frontend -f frontend/Dockerfile
247-
docker tag diffgram/frontend diffgram/frontend:newrelic-${{ env.diffgram_version }}
247+
docker tag diffgram/frontend diffgram/frontend:${{ env.diffgram_version }}
248248
docker push diffgram/frontend --all-tags
249249
Publish-Dispatcher-Docker-Image:
250250
runs-on: ubuntu-latest
@@ -295,5 +295,5 @@ jobs:
295295
docker push diffgram/local_dispatcher
296296
297297
docker build . -t diffgram/local_dispatcher -f local_dispatcher/Dockerfile
298-
docker tag diffgram/local_dispatcher diffgram/local_dispatcher:newrelic-${{ env.diffgram_version }}
298+
docker tag diffgram/local_dispatcher diffgram/local_dispatcher:${{ env.diffgram_version }}
299299
docker push diffgram/local_dispatcher --all-tags

‎default/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ ADD shared /app/shared
1818

1919
WORKDIR /app/
2020
RUN ["chmod", "+x", "/app/db-init.sh"]
21-
#CMD exec gunicorn --bind :$PORT --timeout 120 --worker-class eventlet --workers 3 --no-sendfile --config python:my_conf main:app
21+
2222
EXPOSE 8080
2323
CMD exec gunicorn --bind :8080 --timeout 120 --worker-class sync --workers 5 --no-sendfile main:app

‎default/Dockerfile.newrelic‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎eventhandlers/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
FROM python:3.11.1-bullseye
22
LABEL python_version=python3.11.1
33

4-
ENV DOCKER_CONTEXT=True
5-
64
RUN seq 1 8 | xargs -I{} mkdir -p /usr/share/man/man{}
75
RUN for i in {1..8}; do mkdir -p "/usr/share/man/man$i"; done
86
RUN apt-get update
9-
RUN apt-get install -y libpq-dev python3-dev build-essential
7+
RUN apt-get install -y libpq-dev python3-dev build-essential postgresql postgresql-contrib ffmpeg libsm6 libxext6
108
ADD eventhandlers/requirements.txt /app/
119
RUN pip3 install --upgrade pip
1210
RUN pip3 install setuptools_rust
11+
RUN pip3 install --no-build-isolation tokenizers torch==2.0
1312
RUN apt-get install -y curl
1413
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y # Add this line
1514
ENV PATH="/root/.cargo/bin:${PATH}"
@@ -23,4 +22,5 @@ ENV HF_HOME=/tmp/
2322
WORKDIR /app/
2423
EXPOSE 8086
2524

26-
CMD ["python", "main.py"]
25+
26+
CMD exec newrelic-admin run-program python main.py

‎eventhandlers/Dockerfile.newrelic‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎local_dispatcher/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ RUN pip3 install -r /app/requirements.txt
1414
ADD local_dispatcher/ /app/
1515
ADD shared/ /app/
1616
WORKDIR /app/
17-
#CMD exec gunicorn --bind :$PORT --timeout 120 --worker-class eventlet --workers 3 --no-sendfile --config python:my_conf main:app
17+
1818
EXPOSE 8085
1919
CMD python local_dispatch.py

‎walrus/Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ WORKDIR /app/
4646

4747
ENV PYTHONPATH=/app
4848
ENV NEW_RELIC_CONFIG_FILE=/app/newrelic.ini
49-
#CMD exec gunicorn --bind :$PORT --timeout 120 --worker-class eventlet --workers 3 --no-sendfile --config python:my_conf main:app
5049
EXPOSE 8080
5150

5251
ENTRYPOINT gunicorn --bind :8080 --timeout 120 --worker-class sync --workers 3 --no-sendfile main:app

‎walrus/Dockerfile.newrelic‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)