Merge pull request #10 from myrmex-org/amazonlinux2

Added Amazon Linux 2 image to support node 10.16

Author: AlexisNo

Dockerfile

@@ -8,10 +8,13 @@ module may not be compatible with the Amazon Lambda execution environment.
 A common solution to this problem is to build the package on an EC2 instance using an Amazon Linux AMI and then to
 deploy it in Amazon Lambda. Building serverless applications, it is ironic to be obliged to use an EC2 server to deploy code.
 
-This docker image is based on the [Amazon Linux 1](https://hub.docker.com/_/amazonlinux/) image and contains `gcc`,
-`python 2.7`, `python 3.6`, `python 3.7`, `pip`, `node 6.10`, `node 8.10` to create packages for Amazon Lambda.
+This docker image is based on the [Amazon Linux](https://hub.docker.com/_/amazonlinux/) image and contains `gcc`.
 
-Using the docker image `myrmex/lambda-packager`, you can avoid errors like these during execution in Amazon Lambda:
+The docker image `myrmex/lambda-packager:1` contains `python 2.7`, `python 3.6`, `python 3.7`, `pip`, `node 6.10`, `node 8.10` to create packages for Amazon Lambda.
+
+The docker image for `myrmex/lambda-packager:2` contains `node 10.16` to create packages for Amazon Lambda.
+
+Using the docker images from `myrmex/lambda-packager`, you can avoid errors like these during execution in Amazon Lambda:
 
 ```
 /var/lang/lib/libstdc++.so.6: version `GLIBCXX_3.4.21' not found (required by /var/task/node_modules/bcrypt/lib/binding/bcrypt_lib.node)
@@ -24,18 +27,24 @@ Module version mismatch. Expected 46, got 48.
 ## Usage
 
 You can use a docker volume to mount the code of the Lambda in a container. The directory where `npm install` or
-`pip install` is executed inside the container is `/data`. By default, the installation will be performed for node
-6.10.
+`pip install` is executed inside the container is `/data`. By default, the installation will be performed for node.
 
 ```bash
-docker run -v `pwd`:/data myrmex/lambda-packager
+docker run -v `pwd`:/data myrmex/lambda-packager:1
 ```
 
 The image does not create the zip archive for your. It only installs the dependencies in an environment compatible with
 Lambda. You will still have to zip the result and deploy it in Amazon Lambda.
 
 For a node package, take care that `node_module` does not already exist before running the command.
 
+## Building images locally
+
+```bash
+docker build -t myrmex/lambda-packager:1 -f al1.Dockerfile .
+docker build -t myrmex/lambda-packager:2 -f al2.Dockerfile .
+```
+
 ### Managing permissions
 
 The user account that performs `npm install` or `pip install` inside the container may have a `uid/gid` that differs from the
@@ -51,37 +60,48 @@ docker run -e HOST_UID=`id -u` -e HOST_GID=`id -g` -v `pwd`:/data myrmex/lambda-
 
 The `RUNTIME` environment variable allows to choose the runtime.
 
+### Node 10.16
+
+Node 10.16 is the default runtime for `Amazon Linux 2` and does not require any special configuration.
+
+```bash
+docker run -v `pwd`:/data myrmex/lambda-packager:2
+```
 
 #### Node 8.10
 
-Node 8.10 is the default runtime and does not require any special configuration.
+Node 8.10 is the default runtime for `Amazon Linux` and does not require any special configuration.
+
+```bash
+docker run -v `pwd`:/data myrmex/lambda-packager:1
+```
 
 #### Node 6.10
 
 ```bash
-docker run -e RUNTIME=node6 -v `pwd`:/data myrmex/lambda-packager
+docker run -e RUNTIME=node6 -v `pwd`:/data myrmex/lambda-packager:1
 ```
 
 #### Python 3.7
 
 Python 3.7 is the default Python 3 runtime and accepts the values `python3` or `python3.7`
 
 ```bash
-docker run -e RUNTIME=python3.7 -v `pwd`:/data myrmex/lambda-packager
+docker run -e RUNTIME=python3.7 -v `pwd`:/data myrmex/lambda-packager:1
 ```
 
 #### Python 3.6
 
 ```bash
-docker run -e RUNTIME=python3.6 -v `pwd`:/data myrmex/lambda-packager
+docker run -e RUNTIME=python3.6 -v `pwd`:/data myrmex/lambda-packager:1
 ```
 
 #### Python 2.7
 
 Accepts the values `python` or `python2`.
 
 ```bash
-docker run -e RUNTIME=python -v `pwd`:/data myrmex/lambda-packager
+docker run -e RUNTIME=python -v `pwd`:/data myrmex/lambda-packager:1
 ```
 
 ### Default command

README.md

@@ -0,0 +1,49 @@
+FROM amazonlinux:1
+
+MAINTAINER Alexis N-o "[email protected]"
+
+ENV DEFAULT_USER=myrmex
+ENV NODE_VERSION_6 6.10.3
+ENV NODE_VERSION_8 8.10.0
+ENV PYTHON_VERSION_3_6 3.6.8
+ENV PYTHON_VERSION_3_7 3.7.3
+
+# Install gcc add utilities to manage users and permissions
+RUN yum install -y gcc-c++ util-linux shadow-utils zlib-devel openssl-devel libffi-devel
+
+# Add scripts to install node and python versions
+COPY /install-node.sh /install-node.sh
+COPY /install-python.sh /install-python.sh
+
+# Install node v6 and node v8 as commands "node6" and "node8"
+# Command "node" defaults to v8
+RUN /install-node.sh ${NODE_VERSION_6} &&\
+    /install-node.sh ${NODE_VERSION_8}
+
+# Install python 3.6 and python 3.7 including pip, python 2.7 is already available
+# Command "python3" defaults to 3.7
+RUN curl -O https://bootstrap.pypa.io/get-pip.py &&\
+    python get-pip.py &&\
+    /install-python.sh ${PYTHON_VERSION_3_6} &&\
+    /install-python.sh ${PYTHON_VERSION_3_7}
+
+# Add a script to modify the UID / GID for the default user if needed
+COPY /usr/local/bin/change-uid /usr/local/bin/change-uid
+RUN chmod +x /usr/local/bin/change-uid
+
+# Add a non root user
+RUN useradd $DEFAULT_USER -m -d /home/$DEFAULT_USER/ -s /bin/bash
+
+# Create working directory
+RUN mkdir /data && chown $DEFAULT_USER:$DEFAULT_USER /data
+WORKDIR /data
+
+# Add entrypoint
+COPY /al1.entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
+
+# Add default command
+COPY /cmd.sh /cmd.sh
+RUN chmod +x /cmd.sh
+CMD ["/cmd.sh"]

al1.Dockerfile

@@ -0,0 +1,37 @@
+FROM amazonlinux:2
+
+MAINTAINER Alexis N-o "[email protected]"
+
+ENV DEFAULT_USER=myrmex
+ENV NODE_VERSION_10 10.16.3
+
+# Install gcc add utilities to manage users and permissions
+RUN yum install -y gcc-c++ util-linux shadow-utils zlib-devel openssl-devel libffi-devel tar
+
+# Add a script to install node versions
+COPY /install-node.sh /install-node.sh
+
+# Install node v10
+# Command "node" defaults to v10
+RUN /install-node.sh ${NODE_VERSION_10}
+
+# Add a script to modify the UID / GID for the default user if needed
+COPY /usr/local/bin/change-uid /usr/local/bin/change-uid
+RUN chmod +x /usr/local/bin/change-uid
+
+# Add a non root user
+RUN useradd $DEFAULT_USER -m -d /home/$DEFAULT_USER/ -s /bin/bash
+
+# Create working directory
+RUN mkdir /data && chown $DEFAULT_USER:$DEFAULT_USER /data
+WORKDIR /data
+
+# Add entrypoint
+COPY /al2.entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
+
+# Add default command
+COPY /cmd.sh /cmd.sh
+RUN chmod +x /cmd.sh
+CMD ["/cmd.sh"]

entrypoint.sh al1.entrypoint.shentrypoint.sh renamed to al1.entrypoint.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+
+if [ `whoami` == "root" ]; then
+  echo "Using node v10 runtime"
+
+  if [ "$HOST_UID" != "" ]; then
+      # If the user is root and a HOST_UID environment variable exists,
+      # we change the myrmex user UID and execute the command as the myrmex user
+      if [ "$HOST_UID" != `id -u $DEFAULT_USER` ]; then
+          echo "Changing $DEFAULT_USER UID to $HOST_UID"
+          change-uid $HOST_UID $HOST_GID >/dev/null
+      fi
+  fi
+
+fi
+
+exec $@

al2.Dockerfile

@@ -1,10 +1,4 @@
 #!/bin/bash
 set -e
 
-if [ "$RUNTIME" == "python" ] || [ "$RUNTIME" == "python2" ] || [ "$RUNTIME" == "python2.7" ]; then
-    su $DEFAULT_USER -c "pip install --requirement requirements.txt --upgrade --target ."
-elif [ "$RUNTIME" == "python3" ] || [ "$RUNTIME" == "python3.6" ] || [ "$RUNTIME" == "python3.7" ]; then
-    su $DEFAULT_USER -c "pip3 install --requirement requirements.txt --upgrade --target ."
-else
-    su $DEFAULT_USER -c "npm install --production"
-fi
+su $DEFAULT_USER -c "npm install --production"

al2.entrypoint.sh

@@ -0,0 +1,15 @@
+{
+  "name": "@myrmex/node-packager-example",
+  "version": "1.0.0",
+  "description": "A module to test Myrmex Lambda packager",
+  "main": "index.js",
+  "dependencies": {
+    "pebo": "0.0.2"
+  },
+  "devDependencies": {},
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC"
+}

cmd.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+
+NODE_VERSION=$1
+NODE_SHORT_VERSION="$(cut -d'.' -f1 <<<${NODE_VERSION})"
+
+# Install node version
+cd /opt
+curl -O https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz
+tar xvzf node-v${NODE_VERSION}-linux-x64.tar.gz
+rm node-v${NODE_VERSION}-linux-x64.tar.gz
+ln -s /opt/node-v${NODE_VERSION}-linux-x64/bin/node /usr/local/bin/node${NODE_SHORT_VERSION}
+
+# Set as default node version
+ln -fs /opt/node-v${NODE_VERSION}-linux-x64/bin/node /usr/local/bin/node
+ln -fs /opt/node-v${NODE_VERSION}-linux-x64/bin/npm /usr/local/bin/npm
+
+# Update npm to version 4
+/opt/node-v${NODE_VERSION}-linux-x64/bin/npm install -g npm@4

examples/node/package.json

@@ -0,0 +1,20 @@
+#!/bin/bash
+set -e
+
+PYTHON_VERSION=$1
+PYTHON_MAJOR_VERSION="$(cut -d'.' -f1 <<<${PYTHON_VERSION})"
+PYTHON_MINOR_VERSION="$(cut -d'.' -f1-2 <<<${PYTHON_VERSION})"
+
+# Install python version
+curl -O https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz
+tar zxvf Python-${PYTHON_VERSION}.tgz
+cd Python-${PYTHON_VERSION}
+./configure --prefix=/opt/python-${PYTHON_VERSION}
+make
+make install
+ln -s /opt/python-${PYTHON_VERSION}/bin/python${PYTHON_MAJOR_VERSION} /usr/bin/python${PYTHON_MINOR_VERSION}
+ln -s /opt/python-${PYTHON_VERSION}/bin/pip${PYTHON_MAJOR_VERSION} /usr/bin/pip${PYTHON_MINOR_VERSION}
+
+# Set as default python major version
+ln -fs /opt/python-${PYTHON_VERSION}/bin/python${PYTHON_MAJOR_VERSION} /usr/bin/python${PYTHON_MAJOR_VERSION}
+ln -fs /opt/python-${PYTHON_VERSION}/bin/pip${PYTHON_MAJOR_VERSION} /usr/bin/pip${PYTHON_MAJOR_VERSION}