Merge pull request #2 from Liquid-dev/pre_install_mysql

kyfk · web-flow · commit 631d0032fd13 · 2021-12-14T17:35:02.000+09:00
Preinstall mysql
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
 # https://github.com/lambci/docker-lambda#documentation
 FROM lambci/lambda:build-provided.al2
 
-ARG RUST_VERSION=1.56.1
-RUN yum install -y jq openssl-devel
+ARG RUST_VERSION=1.57.0
+RUN yum install -y jq openssl-devel mysql-devel
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
     | CARGO_HOME=/cargo RUSTUP_HOME=/rustup sh -s -- -y --profile minimal --default-toolchain $RUST_VERSION
 ADD build.sh /usr/local/bin/
diff --git a/build.sh b/build.sh
@@ -28,12 +28,6 @@ export CARGO_TARGET_DIR=$PWD/target/lambda
         yum install -y "$@"
     fi
 
-    if test -f "$HOOKS_DIR/$INSTALL_HOOK"; then
-        echo "Running install hook"
-        /bin/bash "$HOOKS_DIR/$INSTALL_HOOK"
-        echo "Install hook ran successfully"
-    fi
-
     # source cargo
     . $CARGO_HOME/env
 
@@ -69,12 +63,7 @@ function package() {
     cp "${file}.debug" "${OUTPUT_FOLDER}/bootstrap.debug" > 2&>/dev/null || true
 
     if [[ "$PACKAGE" != "false" ]]; then
-        zip -j "$file.zip" "${OUTPUT_FOLDER}/bootstrap"
-        if test -f "$HOOKS_DIR/$PACKAGE_HOOK"; then
-            echo "Running package hook"
-            /bin/bash "$HOOKS_DIR/$PACKAGE_HOOK" $file
-            echo "Package hook ran successfully"
-        fi
+        zip -j "$file.zip" "${OUTPUT_FOLDER}/bootstrap" /usr/lib64/mysql/libmysqlclient.so.18
     fi
 }
 
