Skip to content

Commit

Permalink
Merge pull request #27 from gwu-libraries/t26-upgrade-debian
Browse files Browse the repository at this point in the history
fixes #26. Updates base image and packages
  • Loading branch information
lwrubel authored Dec 4, 2019
2 parents 0ef8583 + c64ab45 commit d00a377
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
16 changes: 5 additions & 11 deletions Dockerfile-loader
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
FROM python:3.6
FROM python:3.6-stretch
MAINTAINER TweetSets <sfm@gwu.edu>

ADD requirements.txt /opt/tweetsets/
WORKDIR /opt/tweetsets
RUN pip install -r requirements.txt
RUN grep elasticsearch-dsl requirements.txt | xargs pip install -t dependencies

RUN set -ex && \
echo 'deb [check-valid-until=no] http://archive.debian.org/debian jessie-backports main' \
> /etc/apt/sources.list.d/jessie-backports.list && \
echo "Acquire::Check-Valid-Until \"false\";" > /etc/apt/apt.conf.d/100disablechecks && \
apt update -y && \
apt install -t \
jessie-backports \
openjdk-8-jre-headless \
ca-certificates-java \
zip -y
RUN apt-get update && \
apt-get install -y openjdk-8-jre-headless \
ca-certificates-java \
zip -y

WORKDIR /opt/tweetsets/dependencies
RUN zip -r ../dependencies.zip .
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-spark
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.6-jessie
FROM python:3.6-stretch
MAINTAINER TweetSets <sfm@gwu.edu>

# Based on https://hub.docker.com/r/gettyimages/spark/~/dockerfile/
Expand Down

0 comments on commit d00a377

Please sign in to comment.