From f0cf2c722836b666954f391589b9bfac1e13b3f9 Mon Sep 17 00:00:00 2001 From: Devin Matte Date: Fri, 1 Nov 2019 14:10:11 -0400 Subject: [PATCH] Upgrading to python 3.7 and shrinking docker build --- .travis.yml | 2 +- Dockerfile | 20 +++++++++++--------- README.md | 4 ++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3490afa5..6d2ad6fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: python python: - - "3.6" + - "3.7" install: - "pip install -r requirements.txt" diff --git a/Dockerfile b/Dockerfile index 82e18878..594379e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,29 +1,31 @@ -FROM python:3.6-stretch +FROM python:3.7-slim-buster MAINTAINER Devin Matte -RUN mkdir /opt/packet +RUN apt-get -yq update && \ + apt-get -yq --no-install-recommends install gcc curl libsasl2-dev libldap2-dev libssl-dev && \ + apt-get -yq clean all -ADD requirements.txt /opt/packet +RUN mkdir /opt/packet WORKDIR /opt/packet -RUN apt-get -yq update && \ - apt-get -yq --allow-unauthenticated install libsasl2-dev libldap2-dev libssl-dev && \ - pip install -r requirements.txt && \ - apt-get -yq clean all +COPY requirements.txt /opt/packet + +RUN pip install -r requirements.txt -ADD . /opt/packet +COPY . /opt/packet RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - && \ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ apt-get -yq update && \ - apt-get -yq install nodejs npm yarn && \ + apt-get -yq --no-install-recommends install nodejs yarn && \ yarn install && \ npm install -g gulp && \ gulp production && \ rm -rf node_modules && \ apt-get -yq remove nodejs npm yarn && \ + apt-get -yq autoremove && \ apt-get -yq clean all RUN ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime diff --git a/README.md b/README.md index be53b307..df1e2f25 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # CSH Web Packet -[![Python 3.6](https://img.shields.io/badge/python-3.6-blue.svg)](https://www.python.org/downloads/release/python-360/) +[![Python 3.7](https://img.shields.io/badge/python-3.7-blue.svg)](https://www.python.org/downloads/release/python-370/) [![Build Status](https://travis-ci.com/ComputerScienceHouse/packet.svg?branch=develop)](https://travis-ci.com/ComputerScienceHouse/packet) Packet is used by CSH to facilitate the freshmen packet portion of our introductory member evaluation process. This is @@ -8,7 +8,7 @@ the second major iteration of packet on the web. The first version was [Tal packet](https://github.com/TalCohen/CSHWebPacket). ## Setup -**Requires Python 3.6 or newer.** +**Requires Python 3.7 or newer.** To get the server working you'll just need the Python dependencies and some secrets. There will be some UI issues due to missing assets though. To solve that you'll want to set up the front end dependencies or download a copy of the