diff --git a/Dockerfile b/Dockerfile index 86d39a5b..f5c51881 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ENV DJANGO_SETTINGS_MODULE=timed.settings \ STATIC_ROOT=/var/www/static \ HURRICANE_REQ_QUEUE_LEN=200 -EXPOSE 80 +EXPOSE 8080 FROM base AS build @@ -40,9 +40,10 @@ FROM build as dev WORKDIR /app -RUN apk update --no-cache && apk add wait4ports --no-cache - -RUN apk add gcc python3-dev musl-dev linux-headers && poetry config virtualenvs.create false && poetry install && apk del gcc python3-dev musl-dev linux-headers --no-cache +RUN apk update --no-cache && \ + apk add gcc python3-dev musl-dev linux-headers wait4ports && \ + poetry config virtualenvs.create false && poetry install && \ + apk del gcc python3-dev musl-dev linux-headers --no-cache USER 1001 @@ -54,7 +55,9 @@ COPY --from=build-prod /tmp/*.whl /tmp/ COPY cmd.sh /usr/local/bin -RUN apk add gcc python3-dev musl-dev linux-headers --no-cache && pip install /tmp/*.whl --no-cache-dir && rm /tmp/*.whl && apk del gcc python3-dev musl-dev linux-headers --no-cache +RUN apk add gcc python3-dev musl-dev linux-headers --no-cache && \ + pip install /tmp/*.whl --no-cache-dir && rm /tmp/*.whl && \ + apk del gcc python3-dev musl-dev linux-headers --no-cache USER 1001 diff --git a/cmd.sh b/cmd.sh index dd155770..109462ef 100755 --- a/cmd.sh +++ b/cmd.sh @@ -9,4 +9,4 @@ manage.py collectstatic --noinput set -e manage.py migrate --no-input -manage.py serve --static --port 80 --req-queue-len "${HURRICANE_REQ_QUEUE_LEN:-250}" "$@" \ No newline at end of file +manage.py serve --static --port 8080 --req-queue-len "${HURRICANE_REQ_QUEUE_LEN:-250}" "$@" \ No newline at end of file diff --git a/compose.override.yaml b/compose.override.yaml index 21ef053d..67827bc1 100644 --- a/compose.override.yaml +++ b/compose.override.yaml @@ -15,7 +15,7 @@ services: volumes: - ./:/app ports: - - "81:81" + - "8081:8081" networks: - timed.local diff --git a/compose.yaml b/compose.yaml index 24ca8133..259fe2de 100644 --- a/compose.yaml +++ b/compose.yaml @@ -16,7 +16,7 @@ services: backend: build: . ports: - - 8000:80 + - 8000:8080 depends_on: - db environment: