diff --git a/Dockerfile.test b/Dockerfile.test deleted file mode 100644 index 1ecffc9c..00000000 --- a/Dockerfile.test +++ /dev/null @@ -1,30 +0,0 @@ -FROM tiangolo/uwsgi-nginx:python3.8-alpine AS builder - -RUN python -m venv /opt/venv -# Make sure we use the virtualenv: -ENV PATH="/opt/venv/bin:$PATH" - -RUN apk add --no-cache --virtual .build-deps ca-certificates gcc linux-headers \ - musl-dev jpeg-dev zlib-dev libffi-dev mysql mariadb-dev git freetype-dev\ - && pip install --upgrade pip - -COPY ./fet2020/requirements.txt /app/requirements.txt - -RUN pip install -r requirements.txt - - -FROM tiangolo/uwsgi-nginx:python3.8-alpine - -RUN apk add ghostscript-dev mariadb-connector-c -COPY --from=builder /opt/venv /opt/venv - -# Make sure we use the virtualenv: -ENV PATH="/opt/venv/bin:$PATH" - -COPY ./tmp/fet2020/fet2020 /app -COPY ./tmp/fet2020/assets /app/assets -COPY ./deployment/nginx.conf /etc/nginx/conf.d/fet2020.conf - -#RUN python manage.py makemigrations && python manage.py makemigrations posts members - - diff --git a/Jenkinsfile b/Jenkinsfile index beb62865..d799ad9a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,7 @@ pipeline { stage('build') { steps{ script { - app = docker.build("fet2020django", "-f Dockerfile.test .") + app = docker.build("fet2020django", "-f Dockerfile .") } } }