diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 75c6e5b0c8f2ea94269adadf1c8c8da18cf74673..0000000000000000000000000000000000000000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ -language: python -python: - - "3.5" - - "3.5-dev" # 3.5 development branch - - "3.6" - - "3.6-dev" # 3.6 development branch - - "3.7" - - "3.7-dev" # 3.7 development branch - # - "nightly" -services: - - postgresql -# command to install dependencies -install: - - pip install -r requirements/development.txt - -before_script: - - psql -c 'create database travis_ci_test;' -U postgres -env: - - DATABASE_URL="postgresql://postgres:postgres@postgres:5432/travis_ci_test" -# command to run tests -script: - - flake8 --max-line-length=125 --exclude=src/kszkepzes,migrations - - python src/manage.py migrate - - python src/manage.py test diff --git a/Dockerfile b/Dockerfile index 0dd2d90d20d02e6e18f3773fa43b4feeea582145..030717cdd793a0a7367cade822888bf852029aff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,27 +1,27 @@ -# pull official base image FROM python:3.8.1 -# set work directory -WORKDIR /usr/src/app - -# set environment variables ENV PYTHONDONTWRITEBYTECODE 1 ENV PYTHONUNBUFFERED 1 +ENV TZ Europe/Budapest + +ENV HOME /home/app +ENV APP_HOME /home/app/kszkepzes-backend +RUN groupadd app && useradd -g app app && \ +mkdir -p /home/app && mkdir $APP_HOME && \ +mkdir $APP_HOME/staticfiles && mkdir $APP_HOME/mediafiles +WORKDIR $APP_HOME -# install dependencies -RUN apt-get -y update -RUN apt-get install -y python python-pip python-dev python-django-extensions postgresql-client netcat -RUN pip install --upgrade pip -COPY ./requirements/production.txt /usr/src/app/requirements.txt +COPY ./requirements/production.txt requirements.txt + +RUN apt-get -y update && apt-get install -y python python-pip python-dev python-django-extensions postgresql-client netcat RUN pip install -r requirements.txt -RUN apt-get -y update && apt-get -y autoremove +COPY ./src $APP_HOME + +RUN chown -R app:app $APP_HOME -# copy entrypoint.sh -COPY ./src/entrypoint.sh /usr/src/app/entrypoint.sh +USER app -# copy project -COPY ./src /usr/src/app/ +EXPOSE 8000 -# run entrypoint.sh -ENTRYPOINT ["/usr/src/app/entrypoint.sh"] \ No newline at end of file +CMD ["gunicorn", "kszkepzes.wsgi:application", "--bind", "0.0.0.0:8000"] diff --git a/Dockerfile.prod b/Dockerfile.prod deleted file mode 100644 index 030717cdd793a0a7367cade822888bf852029aff..0000000000000000000000000000000000000000 --- a/Dockerfile.prod +++ /dev/null @@ -1,27 +0,0 @@ -FROM python:3.8.1 - -ENV PYTHONDONTWRITEBYTECODE 1 -ENV PYTHONUNBUFFERED 1 -ENV TZ Europe/Budapest - -ENV HOME /home/app -ENV APP_HOME /home/app/kszkepzes-backend -RUN groupadd app && useradd -g app app && \ -mkdir -p /home/app && mkdir $APP_HOME && \ -mkdir $APP_HOME/staticfiles && mkdir $APP_HOME/mediafiles -WORKDIR $APP_HOME - -COPY ./requirements/production.txt requirements.txt - -RUN apt-get -y update && apt-get install -y python python-pip python-dev python-django-extensions postgresql-client netcat -RUN pip install -r requirements.txt - -COPY ./src $APP_HOME - -RUN chown -R app:app $APP_HOME - -USER app - -EXPOSE 8000 - -CMD ["gunicorn", "kszkepzes.wsgi:application", "--bind", "0.0.0.0:8000"] diff --git a/README.md b/README.md index b3d8e230e67c037c729c2f6d1d5d824b8247d4aa..7bd2e681af57aa4cec38a132b8b13bab67cca850 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ ## KĂśvetelmĂŠnyek -1. python3.5 +1. python3+ 2. pip ## FejlesztĂŠs @@ -30,7 +30,3 @@ AtirĂĄnyĂtĂĄsi cĂm: `http://127.0.0.1:3000/api/v1/complete/authsch` ## FormĂĄlis KĂśvetelmĂŠnyek 1. flake8-nak feleljen meg 2. 125 karakternĂŠl ne legyen hosszabb sor - -> TODO: BĂśviteni a kĂśvetelmĂŠnyeket - -> TODO: Windows-os leĂrĂĄs