Skip to content

Commit

Permalink
Reapply v2.0.0 changes on origin/master
Browse files Browse the repository at this point in the history
  • Loading branch information
jonseymour committed May 13, 2021
1 parent e14e177 commit 7accb08
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,10 @@ RUN \
./config shared --prefix=${PREFIX}/openssl --openssldir=${PREFIX}/openssl; \
make depend; make install; cd ..; rm -rf openssl

# rsync is required by bin/package.sh, so install it here
RUN \
yum install -y rsync


# Copy shell scripts and config files over
COPY bin/* /usr/local/bin/
Expand Down
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
build:
./build-and-test.sh

clean:
-rm -rf lambda/
-rm lambda-deploy.zip
-rm python/lambda-deploy.zip
git ls-files -o python/lambda | while read f; do rm -- "$$f"; done
5 changes: 3 additions & 2 deletions build-and-test.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#!/bin/bash

set -e
VERSION=$(cat VERSION)
PYVERSION=$(cat python/PYVERSION)

INTERACTIVE=$(if test -t 0; then echo -i; fi)
docker build . -t developmentseed/geolambda:${VERSION}
docker run --rm -v $PWD:/home/geolambda -it developmentseed/geolambda:${VERSION} package.sh
docker run --rm -v $PWD:/home/geolambda ${INTERACTIVE} -t developmentseed/geolambda:${VERSION} package.sh

cd python
docker build . --build-arg VERSION=${VERSION} -t developmentseed/geolambda:${VERSION}-python
Expand Down

0 comments on commit 7accb08

Please sign in to comment.