Skip to content

Commit 7accb08

Browse files
committed
Reapply v2.0.0 changes on origin/master
1 parent e14e177 commit 7accb08

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,10 @@ RUN \
225225
./config shared --prefix=${PREFIX}/openssl --openssldir=${PREFIX}/openssl; \
226226
make depend; make install; cd ..; rm -rf openssl
227227

228+
# rsync is required by bin/package.sh, so install it here
229+
RUN \
230+
yum install -y rsync
231+
228232

229233
# Copy shell scripts and config files over
230234
COPY bin/* /usr/local/bin/

Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
build:
2+
./build-and-test.sh
3+
4+
clean:
5+
-rm -rf lambda/
6+
-rm lambda-deploy.zip
7+
-rm python/lambda-deploy.zip
8+
git ls-files -o python/lambda | while read f; do rm -- "$$f"; done

build-and-test.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#!/bin/bash
2-
2+
set -e
33
VERSION=$(cat VERSION)
44
PYVERSION=$(cat python/PYVERSION)
55

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

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

0 commit comments

Comments
 (0)