diff --git a/Dockerfile b/Dockerfile index 4c6deb3..78a65f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,17 @@ -FROM python:3.6.6 +FROM python:3.7.3 -RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - +RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - RUN apt-get install -y \ groff \ nodejs RUN mkdir /root/.aws -RUN curl -s https://bootstrap.pypa.io/get-pip.py | python RUN pip install \ awscli \ pep8 \ pipenv \ + poetry \ pytest \ pytest-cov \ pytest-mock \ @@ -25,11 +25,5 @@ RUN npm install -g \ ARG YARN_VERSION RUN curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version ${YARN_VERSION} -RUN echo "alias ll='ls -alFh --color=auto'" >> /root/.bashrc -RUN echo "alias l='ls -alFh --color=auto'" >> /root/.bashrc - -# assuming that your serverless python libs live here -RUN echo "export PYTHONPATH=/code/serverless/lib" >> /root/.bashrc - RUN mkdir /code WORKDIR /code diff --git a/Makefile b/Makefile index e8e080e..5d092ad 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ NAME = verypossible/serverless SERVERLESS_VERSION = 1.35.1 -YARN_VERSION = 1.12.3 +YARN_VERSION = 1.15.2 .PHONY: all py3 shell diff --git a/hooks/build b/hooks/build index 3d44057..87d5ac0 100755 --- a/hooks/build +++ b/hooks/build @@ -7,6 +7,6 @@ echo "Using $DOCKERFILE for build" docker build \ --build-arg SERVERLESS_VERSION=1.35.1 \ - --build-arg YARN_VERSION=1.12.3 \ + --build-arg YARN_VERSION=1.15.2 \ -f $DOCKERFILE \ -t $IMAGE_NAME .