Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update yarn, add poetry, update python, use new node target to ensure… #28

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion hooks/build
Original file line number Diff line number Diff line change
Expand Up @@ -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 .