Skip to content

Commit

Permalink
fix: linting errors
Browse files Browse the repository at this point in the history
  • Loading branch information
codekow committed Oct 11, 2022
1 parent 54055fc commit ebb854b
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ jobs:
- name: Run Hadolint
uses: jbergstroem/hadolint-gh-action@v1
with:
dockerfile: "**/Dockerfile*"
dockerfile: "Dockerfile*"
2 changes: 2 additions & 0 deletions .hadolint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ignored:
- DL3013
9 changes: 4 additions & 5 deletions Dockerfile.server
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM python:3.8.12
FROM docker.io/python:3.8.12

# need this for the Dash app
EXPOSE 8050

# install pipenv
RUN pip install pipenv
RUN pip --no-cache-dir install pipenv

# create a working directory
RUN mkdir explorer
# RUN mkdir explorer

# set that directory as working dir
WORKDIR /explorer
Expand All @@ -27,5 +27,4 @@ COPY ./ /explorer/
# Description of how to choose the number of workers and threads.
# common wisdom is (2*CPU)+1 workers:
# https://medium.com/building-the-system/gunicorn-3-means-of-concurrency-efbb547674b7
CMD gunicorn --bind :8050 app:server --workers 8 --threads 4

CMD [ "gunicorn", "--bind", ":8050", "app:server", "--workers", "8", "--threads", "4" ]
13 changes: 5 additions & 8 deletions Dockerfile.supervisor_workers
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
FROM python:3.8.12
FROM docker.io/python:3.8.12

# need this for the Dash app
EXPOSE 8050

# install pipenv
RUN pip install pipenv

# install supervisor
RUN pip install supervisor
# install pipenv supervisor
RUN pip --no-cache-dir install pipenv supervisor

# copy config
ADD supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf

# create a working directory
RUN mkdir explorer
Expand All @@ -30,4 +27,4 @@ RUN pipenv install --system --deploy
COPY ./ /explorer/

# run supervisord
CMD supervisord
CMD [ "supervisord" ]
8 changes: 4 additions & 4 deletions Dockerfile.worker
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM python:3.8.12
FROM docker.io/python:3.8.12

# need this for the Dash app
EXPOSE 8050

# install pipenv
RUN pip install pipenv
RUN pip --no-cache-dir install pipenv

# create a working directory
RUN mkdir explorer
# RUN mkdir explorer

# set that directory as working dir
WORKDIR /explorer
Expand All @@ -24,4 +24,4 @@ RUN pipenv install --system --deploy
COPY ./ /explorer/

# run worker
CMD rq worker -c worker_settings
CMD [ "rq", "worker", "-c", "worker_settings" ]
2 changes: 2 additions & 0 deletions scripts/launch_dev.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/sh

# It's common to have access permission denied by the Docker Daemon
# on Linux machines if you don't run Docker with root permissions.

Expand Down

0 comments on commit ebb854b

Please sign in to comment.