Skip to content

Commit

Permalink
Merge pull request #270 from aws-solutions/release_candidate/v1.1.6
Browse files Browse the repository at this point in the history
Update to version v1.1.6
  • Loading branch information
bassemwanis authored Aug 6, 2024
2 parents 8b48228 + 4244e1c commit 93859b7
Show file tree
Hide file tree
Showing 13 changed files with 49 additions and 195 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.1.6] - 2024-08-06

### Updated
- Lambda runtime to Python 3.12


## [1.1.5] - 2024-06-25

### Security
Expand Down
6 changes: 3 additions & 3 deletions deployment/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM public.ecr.aws/lambda/python:3.11
FROM public.ecr.aws/lambda/python:3.12
CMD bash
WORKDIR /site-packages
RUN pip3.11 install --upgrade pip
RUN pip3.11 install -t . jwcrypto==1.5.6
RUN pip install --upgrade pip
RUN pip install -t . jwcrypto==1.5.6
152 changes: 0 additions & 152 deletions deployment/build-open-source-dist.sh

This file was deleted.

12 changes: 6 additions & 6 deletions deployment/build-s3-dist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ while getopts ':h' OPTION; do
h)
echo
echo "script usage: $(basename $0) DIST_OUTPUT_BUCKET SOLUTION_NAME VERSION"
echo "example usage: ./$(basename $0) mybucket virtual-waiting-room-on-aws v1.1.5"
echo "example usage: ./$(basename $0) mybucket virtual-waiting-room-on-aws v1.1.6"
echo
echo "If no arguments are passed in, the following default values are used:"
echo "DIST_OUTPUT_BUCKET=rodeolabz"
echo "SOLUTION_NAME=virtual-waiting-room-on-aws"
echo "VERSION=v1.1.5"
echo "VERSION=v1.1.6"
echo
echo "You may export export these variables in your environment and call the script using those variables:"
echo "./$(basename $0) \$DIST_OUTPUT_BUCKET \$SOLUTION_NAME \$VERSION"
Expand Down Expand Up @@ -79,16 +79,16 @@ fi

if [ -z "$3" ]
then
echo "Setting default version to v1.1.5"
VERSION='v1.1.5'
echo "Setting default version to v1.1.6"
VERSION='v1.1.6'
fi

template_dir="$PWD" # /deployment
template_dist_dir="$template_dir/global-s3-assets"
build_dist_dir="$template_dir/regional-s3-assets"
pkg_dir="$template_dir/pkg"
source_dir="$template_dir/../source"
common_version=1.1.5
common_version=1.1.6

echo "------------------------------------------------------------------------------"
echo "[Init] Clean old dist, node_modules and bower_components folders"
Expand Down Expand Up @@ -118,7 +118,7 @@ echo "--------------------------------------------------------------------------
echo "Redis layer"
echo "------------------------------------------------------------------------------"
# build the redis layer Zip file
layer_dir=$source_dir/python/lib/python3.11/site-packages/
layer_dir=$source_dir/python/lib/python3.12/site-packages/
mkdir -p $layer_dir
cd $source_dir
rm -rf error.txt
Expand Down
2 changes: 1 addition & 1 deletion deployment/docker_build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

target_dir="../source/python/lib/python3.11/"
target_dir="../source/python/lib/python3.12/"

if [ ! -f Dockerfile ]; then
echo "*** Dockerfile is not here, are you in the right place? ***"
Expand Down
2 changes: 1 addition & 1 deletion deployment/run-unit-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ python3 -m venv "$VENV"
source "$VENV"/bin/activate

# Install the common package into the virtual envronment before running
pip install ./pkg/virtual_waiting_room_on_aws_common-1.1.5-py3-none-any.whl || pip install -e ./../source/shared/virtual-waiting-room-on-aws-common
pip install ./pkg/virtual_waiting_room_on_aws_common-1.1.6-py3-none-any.whl || pip install -e ./../source/shared/virtual-waiting-room-on-aws-common
cd ./../deployment

# install dependencies
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"Arn"
]
},
"Runtime": "python3.11",
"Runtime": "python3.12",
"Timeout": 30
},
"Metadata": {
Expand Down Expand Up @@ -263,7 +263,7 @@
"Arn"
]
},
"Runtime": "python3.11",
"Runtime": "python3.12",
"Timeout": 30
},
"Metadata": {
Expand Down
Loading

0 comments on commit 93859b7

Please sign in to comment.