Skip to content

Commit ac39cd9

Browse files
committed
Added --no-deps flag
1 parent 3dad4a1 commit ac39cd9

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ Usage: build.sh [-p PYTHON_VER] [-n NAME] [-r] [-h] [-v]
5252
-p PYTHON_VER : Python version to use: 2.7, 3.6, 3.7 (default 3.7)
5353
-n NAME : Name of the layer
5454
-r : Raw mode, don't zip layer contents
55+
-d : Don't install Python dependencies
5556
-h : Help
5657
-v : Display build.sh version
5758
```
@@ -82,7 +83,7 @@ rm test.xt
8283

8384
The `_make.sh` script will then execute the commands after the Python packages have been installed.
8485

85-
## Deinstallation
86+
## Uninstall
8687

8788
If installed as submodule and need to remove
8889

_make.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,20 @@ set -e
1010
# /python/lib/pythonX.X/site-packages
1111

1212
scriptname=$(basename "$0")
13-
scriptbuildnum="1.0.0"
14-
scriptbuilddate="2020-03-29"
13+
scriptbuildnum="1.0.1"
14+
scriptbuilddate="2020-05-01"
1515

1616
### Variables
1717
CURRENT_DIR=$(reldir=$(dirname -- "$0"; echo x); reldir=${reldir%?x}; cd -- "$reldir" && pwd && echo x); CURRENT_DIR=${CURRENT_DIR%?x}
1818
PYTHON="python${PYTHON_VER}"
1919
ZIP_FILE="${NAME}_${PYTHON}.zip"
2020

21+
if [[ "$NO_DEPS" = true ]]; then
22+
DEPS_FLAG="--no-deps"
23+
else
24+
DEPS_FLAG=""
25+
fi
26+
echo $DEPS_FLAG
2127
echo "Building layer: ${NAME} for ${PYTHON}"
2228

2329
# Delete build dir
@@ -31,7 +37,7 @@ virtualenv -p $PYTHON /tmp/build
3137
source /tmp/build/bin/activate
3238

3339
# Install requirements
34-
pip install -r /temp/build/requirements.txt --no-cache-dir
40+
pip install -r /temp/build/requirements.txt --no-cache-dir $DEPS_FLAG
3541

3642
# Create staging area in dir structure req for lambda layers
3743
mkdir -p "/tmp/base/python/lib/${PYTHON}"

build.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ set -e
1313
# Zip filename includes python version used in its creation
1414

1515
scriptname=$(basename "$0")
16-
scriptbuildnum="1.0.0"
17-
scriptbuilddate="2020-03-29"
16+
scriptbuildnum="1.0.1"
17+
scriptbuilddate="2020-05-01"
1818

1919
# Used to set destination of zip
2020
SUBDIR_MODE=""
@@ -31,16 +31,18 @@ usage() {
3131
echo -e " -p PYTHON_VER\t: Python version to use: 2.7, 3.6, 3.7 (default 3.7)"
3232
echo -e " -n NAME\t: Name of the layer"
3333
echo -e " -r\t\t: Raw mode, don't zip layer contents"
34+
echo -e " -d\t\t: Don't install Python dependencies"
3435
echo -e " -h\t\t: Help"
3536
echo -e " -v\t\t: Display ${scriptname} version"
3637
}
3738

3839
# Handle configuration
39-
while getopts ":p:n:rhv" arg; do
40+
while getopts ":p:n:drhv" arg; do
4041
case "${arg}" in
4142
p) PYTHON_VER=${OPTARG};;
4243
n) NAME=${OPTARG};;
4344
r) RAW_MODE=true;;
45+
d) NO_DEPS=true;;
4446
h) usage; exit;;
4547
v) displayVer; exit;;
4648
\?) echo -e "Error - Invalid option: $OPTARG"; usage; exit;;
@@ -56,6 +58,7 @@ CURRENT_DIR=$(reldir=$(dirname -- "$0"; echo x); reldir=${reldir%?x}; cd -- "$re
5658
BASE_DIR=$(basename $CURRENT_DIR)
5759
PARENT_DIR=${CURRENT_DIR%"${BASE_DIR}"}
5860
RAW_MODE="${RAW_MODE:-false}"
61+
NO_DEPS="${NO_DEPS:-false}"
5962

6063
# Find location of requirements.txt
6164
if [[ -f "${CURRENT_DIR}/requirements.txt" ]]; then
@@ -95,7 +98,7 @@ else
9598
fi
9699

97100
# Run build
98-
docker run --rm -e PYTHON_VER="$PYTHON_VER" -e NAME="$NAME" -e RAW_MODE="$RAW_MODE" -e PARENT_DIR="${PARENT_DIR}" -e SUBDIR_MODE="$SUBDIR_MODE" -v "$CURRENT_DIR":/var/task -v "$REQ_PATH":/temp/build/requirements.txt -v "$CLEAN_PATH":/temp/build/_clean.sh "lambci/lambda:build-python${PYTHON_VER}" bash /var/task/_make.sh
101+
docker run --rm -e PYTHON_VER="$PYTHON_VER" -e NAME="$NAME" -e RAW_MODE="$RAW_MODE" -e NO_DEPS="$NO_DEPS" -e PARENT_DIR="${PARENT_DIR}" -e SUBDIR_MODE="$SUBDIR_MODE" -v "$CURRENT_DIR":/var/task -v "$REQ_PATH":/temp/build/requirements.txt -v "$CLEAN_PATH":/temp/build/_clean.sh "lambci/lambda:build-python${PYTHON_VER}" bash /var/task/_make.sh
99102

100103
# Move ZIP to parent dir if SUBDIR_MODE set
101104
if [[ "$SUBDIR_MODE" ]]; then

0 commit comments

Comments
 (0)