Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the official Lambda Docker images from AWS #52

Draft
wants to merge 4 commits into
base: develop
Choose a base branch
from
Draft

Use the official Lambda Docker images from AWS #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f11881
Switch to the official Lambda Docker images from AWS
jsf9k Feb 1, 2023
d8fba4e
Install some basic packages
jsf9k Feb 1, 2023
18fb8ec
Enforce the use of python3 and pip3
jsf9k Feb 1, 2023
1349ec5
Update email address from trio to gwe
jsf9k Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions pshtt/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
FROM lambci/lambda:build-python3.7
MAINTAINER Shane Frasier <jeremy.frasier@trio.dhs.gov>
FROM public.ecr.aws/lambda/python:3.7
MAINTAINER Shane Frasier <jeremy.frasier@gwe.cisa.dhs.gov>

# We need wget to download the public suffix list
RUN yum -q -y install wget
# We need to install some basic packages so that the Docker container
# can run the build_pshtt.sh script.
RUN yum -q -y install \
wget \
zip

COPY build_pshtt.sh .

Expand Down
8 changes: 4 additions & 4 deletions pshtt/build_pshtt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set -o pipefail
# Set up the Python virtual environment
###
VENV_DIR=/venv
python -m venv $VENV_DIR
python3 -m venv $VENV_DIR
# Note that we have to turn off nounset before running activate, since
# otherwise we can get an error that states "/venv/bin/activate: line
# 6: _OLD_VIRTUAL_PATH: unbound variable". See
Expand All @@ -25,19 +25,19 @@ set -o nounset
###
# Update pip, setuptools, and wheel
###
pip install --upgrade pip setuptools wheel
pip3 install --upgrade pip setuptools wheel

##
# Install pshtt
##
pip install --upgrade pshtt==0.6.10
pip3 install --upgrade pshtt==0.6.10

###
# Install domain-scan
###
[ -d domain-scan ] || mkdir domain-scan
wget -q -O - https://api.github.com/repos/cisagov/domain-scan/tarball | tar xz --strip-components=1 -C domain-scan
pip install --upgrade -r domain-scan/lambda/requirements-lambda.txt
pip3 install --upgrade -r domain-scan/lambda/requirements-lambda.txt

###
# Leave the Python virtual environment
Expand Down
11 changes: 7 additions & 4 deletions sslyze/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
FROM lambci/lambda:build-python3.7
MAINTAINER Shane Frasier <jeremy.frasier@trio.dhs.gov>
FROM public.ecr.aws/lambda/python:3.7
MAINTAINER Shane Frasier <jeremy.frasier@gwe.cisa.dhs.gov>

# We need wget to download the public suffix list
RUN yum -q -y install wget
# We need to install some basic packages so that the Docker container
# can run the build_sslyze.sh script.
RUN yum -q -y install \
wget \
zip

COPY build_sslyze.sh .

Expand Down
8 changes: 4 additions & 4 deletions sslyze/build_sslyze.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set -o pipefail
# Set up the Python virtual environment
###
VENV_DIR=/venv
python -m venv $VENV_DIR
python3 -m venv $VENV_DIR
# Note that we have to turn off nounset before running activate, since
# otherwise we can get an error that states "/venv/bin/activate: line
# 6: _OLD_VIRTUAL_PATH: unbound variable". See
Expand All @@ -25,19 +25,19 @@ set -o nounset
###
# Update pip, setuptools, and wheel
###
pip install --upgrade pip setuptools wheel
pip3 install --upgrade pip setuptools wheel

###
# Install sslyze
###
pip install --upgrade sslyze==2.1.4
pip3 install --upgrade sslyze==2.1.4

###
# Install domain-scan
###
[ -d domain-scan ] || mkdir domain-scan
wget -q -O - https://api.github.com/repos/cisagov/domain-scan/tarball | tar xz --strip-components=1 -C domain-scan
pip install --upgrade -r domain-scan/lambda/requirements-lambda.txt
pip3 install --upgrade -r domain-scan/lambda/requirements-lambda.txt

###
# Leave the Python virtual environment
Expand Down
11 changes: 7 additions & 4 deletions trustymail/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
FROM lambci/lambda:build-python3.7
MAINTAINER Shane Frasier <jeremy.frasier@trio.dhs.gov>
FROM public.ecr.aws/lambda/python:3.7
MAINTAINER Shane Frasier <jeremy.frasier@gwe.cisa.dhs.gov>

# We need wget to download the public suffix list
RUN yum -q -y install wget
# We need to install some basic packages so that the Docker container
# can run the build_trustymail.sh script.
RUN yum -q -y install \
wget \
zip

COPY build_trustymail.sh .

Expand Down
8 changes: 4 additions & 4 deletions trustymail/build_trustymail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set -o pipefail
# Set up the Python virtual environment
###
VENV_DIR=/venv
python -m venv $VENV_DIR
python3 -m venv $VENV_DIR
# Note that we have to turn off nounset before running activate, since
# otherwise we can get an error that states "/venv/bin/activate: line
# 6: _OLD_VIRTUAL_PATH: unbound variable". See
Expand All @@ -25,19 +25,19 @@ set -o nounset
###
# Update pip, setuptools, and wheel
###
pip install --upgrade pip setuptools wheel
pip3 install --upgrade pip setuptools wheel

##
# Install trustymail
##
pip install --upgrade trustymail==0.8.1
pip3 install --upgrade trustymail==0.8.1

###
# Install domain-scan
###
[ -d domain-scan ] || mkdir domain-scan
wget -q -O - https://api.github.com/repos/cisagov/domain-scan/tarball | tar xz --strip-components=1 -C domain-scan
pip install --upgrade -r domain-scan/lambda/requirements-lambda.txt
pip3 install --upgrade -r domain-scan/lambda/requirements-lambda.txt

###
# Leave the Python virtual environment
Expand Down