diff --git a/Dockerfile b/Dockerfile index a0fb494..9eb2cd6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,12 +3,15 @@ FROM nginx:1.19.0-alpine RUN apk update RUN apk add --no-cache build-base bash git python3 make tzdata curl py3-pip libressl-dev musl-dev libffi-dev python3-dev cargo +RUN curl -sSL https://install.python-poetry.org | python - --version 1.4.0 +RUN poetry config virtualenvs.create false + # install poetry -ENV POETRY_HOME=/opt/poetry -RUN python3 -m venv $POETRY_HOME -RUN $POETRY_HOME/bin/pip install --upgrade pip -RUN $POETRY_HOME/bin/pip install setuptools_rust poetry==1.4.0 -RUN $POETRY_HOME/bin/poetry --version +#ENV POETRY_HOME=/opt/poetry +#RUN python3 -m venv $POETRY_HOME +#RUN $POETRY_HOME/bin/pip install --upgrade pip +#RUN $POETRY_HOME/bin/pip install setuptools_rust poetry==1.4.0 +#RUN $POETRY_HOME/bin/poetry --version COPY docker/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/docker-init.sh b/docker/docker-init.sh index 3df36c9..c5d5c63 100644 --- a/docker/docker-init.sh +++ b/docker/docker-init.sh @@ -1,14 +1,16 @@ #!/bin/bash -export POETRY_HOME=/opt/poetry +#export POETRY_HOME=/opt/poetry # clone and build blog cd / rm -rf /blog git clone https://github.com/kianby/blog.git cd /blog -$POETRY_HOME/bin/poetry install -$POETRY_HOME/bin/poetry run make +#$POETRY_HOME/bin/poetry install +#$POETRY_HOME/bin/poetry run make +poetry install +poetry run make # nginx serve #nginx -g 'daemon off;'