Update buildscript to amazonami 2023

Author: Szpadel

Diff for: Dockerfile

@@ -1,49 +1,39 @@
-FROM amazonlinux:2
+FROM amazonlinux:2023
 
-ARG LAMBDA_NODEJS_RELEASE="12.x"
+ARG LAMBDA_NODEJS_RELEASE="20.x"
 
-RUN yum groups mark install "Development Tools" \
-    && yum groups mark convert "Development Tools" \
-    && yum groupinstall -y "Development Tools" \
-    && yum -y install \
+RUN dnf -y groups mark install "Development Tools" \
+    && dnf -y groupinstall -y "Development Tools" \
+    && dnf -y install --allowerasing \
         zip \
         rsync \
-        curl \
         which \
-        mc \
-        nano \
-        coreutils \
-        findutils
-
-RUN curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo > /etc/yum.repos.d/yarn.repo \
-    && rpm -Uvh https://rpm.nodesource.com/pub_${LAMBDA_NODEJS_RELEASE}/el/7/x86_64/nodesource-release-el7-1.noarch.rpm
-    
-RUN yum -y install \
-        yarn \
+        findutils \
+        curl \
+    && dnf -y clean all
+
+RUN dnf install -y https://rpm.nodesource.com/pub_${LAMBDA_NODEJS_RELEASE}/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm
+
+RUN dnf -y install \
         nodejs \
         nasm \
         libjpeg-devel \
         libpng-devel \
         libtiff-devel \
-        libgif-devel
+    && dnf -y clean all \
+    && npm i -g yarn
 
-RUN yum -y install \
-        python2 \
-        python2-pip \
+RUN dnf -y install \
         python3 \
         python3-pip \
-        python2-botocore \
-        python2-boto3 \
         awscli \
     && pip3 install --user \
         boto3 \
-        botocore
-        
-RUN yum -y clean all
+        botocore \
+    && dnf -y clean all
 
 ENV LAMBDA_NODEJS_RELEASE="$LAMBDA_NODEJS_RELEASE" \
-    LAMBDA_PYTHON2_RELEASE="2.7" \
-    LAMBDA_PYTHON3_RELEASE="3.7" \
+    LAMBDA_PYTHON3_RELEASE="3.9.x" \
     LAMBDA_BUILD_DIR="/var/app-local" \
     LAMBDA_WORK_DIR="/var/app"
 
@@ -57,6 +47,3 @@ CMD chmod+x /bin/mageops-lambda-build \
 WORKDIR /var/app-local
 
 ENTRYPOINT [ "/bin/mageops-lambda-build" ]
-
-
-

Diff for: build.sh

@@ -11,7 +11,6 @@ export LAMBDA_BUILD_HOOK_PRE_BUILD="${LAMBDA_PRE_BUILD_SCRIPT:-.lambda-build-hoo
 # Directory where custom shared libraries shall be placed in order to be loaded automatically.
 export LAMBDA_SHARED_LIB_DIR="${LAMBDA_SHARED_LIB_DIR:-${LAMBDA_WORK_DIR}/lib}"
 
-export LAMBDA_PYTHON2_RELEASE="${LAMBDA_PYTHON2_RELEASE:--unknown}"
 export LAMBDA_PYTHON3_RELEASE="${LAMBDA_PYTHON3_RELEASE:--unknown}"
 export LAMBDA_NODEJS_RELEASE="${LAMBDA_NODEJS_RELEASE:--unknown}"
 
@@ -36,24 +35,6 @@ function build_prepare() {
 		"${LAMBDA_WORK_DIR}/" "${LAMBDA_BUILD_DIR}/"
 }
 
-function build_python2() {
-	LAMBDA_PACKAGE_NAME="${LAMBDA_PACKAGE_NAME:-$LAMBDA_NAME.python${LAMBDA_PYTHON2_RELEASE}}"
-
-	log_stage "Start python2 build"
-	log_info "Python: $(python2 --version) ($(which python2))"
-	log_info "Pip: $(pip2 --version) ($(which pip2))"
-
-	log_stage "Install python requirements"
-	pip2 install -r requirements.txt -t "$LAMBDA_BUILD_DIR"
-
-	ls -al
-	log_stage "Store list of installed python deps"
-	PYTHONPATH="$LAMBDA_BUILD_DIR" pip2 freeze -r requirements.txt --local | tee "$LAMBDA_BUILD_DIR/requirements-built.txt"
-
-	log_stage "Precompile python sources"
-	python2 -m compileall "$LAMBDA_BUILD_DIR/"
-}
-
 function build_python3() {
 	LAMBDA_PACKAGE_NAME="${LAMBDA_PACKAGE_NAME:-$LAMBDA_NAME.python${LAMBDA_PYTHON3_RELEASE}}"
 
@@ -136,7 +117,6 @@ echo -e "\
 Usage: $(basename "$0") <env_type> <lambda_release_name> [custom_build_command]\n\
 \n\
 Available env types:\n\
-  - python2       (python$LAMBDA_PYTHON2_RELEASE) \n\
   - python3       (python$LAMBDA_PYTHON3_RELEASE) \n\
   - nodejs        (nodejs$LAMBDA_NODEJS_RELEASE) \n\
   - nodejs-yarn   (nodejs$LAMBDA_NODEJS_RELEASE)\
@@ -158,10 +138,9 @@ export LAMBDA_CUSTOM_BUILD_CMD="$@"
 log_info "Host: $(uname -a)"
 
 case "$LAMBDA_ENV_TYPE" in
-    "python2")             LAMBDA_BUILD="python2" ;;
     "python3")             LAMBDA_BUILD="python3" ;;
-		"nodejs")              LAMBDA_BUILD="nodejs_npm" ;;
-		"nodejs-yarn")         LAMBDA_BUILD="nodejs_yarn" ;;
+	"nodejs")              LAMBDA_BUILD="nodejs_npm" ;;
+	"nodejs-yarn")         LAMBDA_BUILD="nodejs_yarn" ;;
     *)                     echo -e "Error - unknown lambda environemnt type: $LAMBDA_ENV_TYPE\n" >&2 && show_help && exit 9 ;;
 esac