From a500e8a687da69c7a79fd7953f8a30c8f36a348f Mon Sep 17 00:00:00 2001 From: Brian Bjarke Jensen Date: Mon, 20 May 2024 22:10:54 +0200 Subject: [PATCH] fixed ci --- .gitea/workflows/publish.yaml | 3 +- Dockerfile | 65 ----------------------------------- 2 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 Dockerfile diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 68dfe15..aa8d19a 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -44,8 +44,7 @@ jobs: - name: Build and Push Image uses: docker/build-push-action@v4 with: - context: . - dockerfile: ./web_ui/ + context: ./web_ui/ push: true tags: | ${{ vars.docker_repo_url }}/${{ gitea.repository }}/web_ui:${{ env.sha_short }} diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index d481a47..0000000 --- a/Dockerfile +++ /dev/null @@ -1,65 +0,0 @@ -########### -# BUILDER # -########### - -# pull official base image -FROM python:3.12-slim-bullseye as BUILDER - -# set environment variables -ENV PYTHONUNBUFFERED=1 \ - PYTHONDONTWRITEBYTECODE=1 \ - PIP_NO_CACHE_DIR=off \ - PIP_DISABLE_PIP_VERSION_CHECK=ON \ - PIP_DEFAULT_TIMEOUT=100 \ - DEBIAN_FRONTEND=noninteractive \ - POETRY_HOME=/etc/poetry \ - POETRY_VERSION=1.7.1 \ - POETRY_VIRTUALENVS_IN_PROJECT=1 \ - POETRY_VIRTUALENVS_CREATE=1 \ - POETRY_NO_INTERACTION=1 \ - POETRY_CACHE_DIR=/tmp/poetry_cache \ - APP_HOME=/home/app - -# update system -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - build-essential \ - curl \ - && apt-get clean - -# install poetry -RUN curl -sSL https://install.python-poetry.org | python3 - -ENV PATH="${POETRY_HOME}/bin:$PATH" - -# install runtime dependencies -WORKDIR ${APP_HOME} -COPY poetry.lock pyproject.toml ./ -RUN --mount=type=cache,target=${POETRY_CACHE_DIR} poetry install - -######### -# FINAL # -######### - -# pull official base image -FROM python:3.12-slim-bullseye - -# copy virtualenv made by poetry -ENV APP_HOME=/home/app \ - VIRTUAL_ENV=/home/app/.venv -COPY --from=builder ${VIRTUAL_ENV} ${VIRTUAL_ENV} -ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" - -# create home directory and app user -RUN mkdir -p /home/app && \ - addgroup --system app && \ - adduser --system --group app - -# add code while changing ownership -WORKDIR $APP_HOME -COPY --chown=app:app ./src ./src -COPY --chown=app:app ./core ./core - -# change to the app user -USER app - -ENTRYPOINT [ "gunicorn", "src.main:server", "-b", "0.0.0.0:8050" ]