Skip to content

Commit c42fbf7

Browse files
authored
Merge pull request #195 from devinmatte/python3.7
Upgrading to python 3.7 and shrinking docker build
2 parents bc5bbd1 + f0cf2c7 commit c42fbf7

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: python
22
python:
3-
- "3.6"
3+
- "3.7"
44

55
install:
66
- "pip install -r requirements.txt"

Dockerfile

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
1-
FROM python:3.6-stretch
1+
FROM python:3.7-slim-buster
22
MAINTAINER Devin Matte <matted@csh.rit.edu>
33

4-
RUN mkdir /opt/packet
4+
RUN apt-get -yq update && \
5+
apt-get -yq --no-install-recommends install gcc curl libsasl2-dev libldap2-dev libssl-dev && \
6+
apt-get -yq clean all
57

6-
ADD requirements.txt /opt/packet
8+
RUN mkdir /opt/packet
79

810
WORKDIR /opt/packet
911

10-
RUN apt-get -yq update && \
11-
apt-get -yq --allow-unauthenticated install libsasl2-dev libldap2-dev libssl-dev && \
12-
pip install -r requirements.txt && \
13-
apt-get -yq clean all
12+
COPY requirements.txt /opt/packet
13+
14+
RUN pip install -r requirements.txt
1415

15-
ADD . /opt/packet
16+
COPY . /opt/packet
1617

1718
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
1819
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
1920
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
2021
apt-get -yq update && \
21-
apt-get -yq install nodejs npm yarn && \
22+
apt-get -yq --no-install-recommends install nodejs yarn && \
2223
yarn install && \
2324
npm install -g gulp && \
2425
gulp production && \
2526
rm -rf node_modules && \
2627
apt-get -yq remove nodejs npm yarn && \
28+
apt-get -yq autoremove && \
2729
apt-get -yq clean all
2830

2931
RUN ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# CSH Web Packet
22

3-
[![Python 3.6](https://img.shields.io/badge/python-3.6-blue.svg)](https://www.python.org/downloads/release/python-360/)
3+
[![Python 3.7](https://img.shields.io/badge/python-3.7-blue.svg)](https://www.python.org/downloads/release/python-370/)
44
[![Build Status](https://travis-ci.com/ComputerScienceHouse/packet.svg?branch=develop)](https://travis-ci.com/ComputerScienceHouse/packet)
55

66
Packet is used by CSH to facilitate the freshmen packet portion of our introductory member evaluation process. This is
77
the second major iteration of packet on the web. The first version was
88
[Tal packet](https://github.com/TalCohen/CSHWebPacket).
99

1010
## Setup
11-
**Requires Python 3.6 or newer.**
11+
**Requires Python 3.7 or newer.**
1212

1313
To get the server working you'll just need the Python dependencies and some secrets. There will be some UI issues due
1414
to missing assets though. To solve that you'll want to set up the front end dependencies or download a copy of the

0 commit comments

Comments
 (0)