Skip to content

Commit 9eec5a7

Browse files
phirovphirov
committed
update pluck
1 parent a157405 commit 9eec5a7

11 files changed

Lines changed: 69 additions & 35 deletions

File tree

‎README.md‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,17 @@ Miniconda inspireded from [frol](https://github.com/frol/docker-alpine-miniconda
99
## Images list
1010

1111

12-
|image | version | Dockerfiles |
13-
|----------|---------|-------------|
14-
|**python**| `2`, `latest` | *([2/Dockerfile](https://github.com/phirov/docker-python/tree/master/python/2/Dockerfile))* |
15-
| | `3` | *([3/Dockerfile](https://github.com/phirov/docker-python/tree/master/python/3/Dockerfile))* |
12+
|image | version | Dockerfiles |
13+
|----------|--------------------|-------------|
14+
|**python**| `2`, `latest` | *([2/Dockerfile](https://github.com/phirov/docker-python/tree/master/python/2/Dockerfile))* |
15+
| | `3` | *([3/Dockerfile](https://github.com/phirov/docker-python/tree/master/python/3/Dockerfile))* |
1616
|**pandas**| `0.19-2`, `latest` | *([0.19/2/Dockerfile](https://github.com/phirov/docker-python/tree/master/pandas/0.19/2/Dockerfile))* |
17-
| | `0.19-3`| *([0.19/3/Dockerfile](https://github.com/phirov/docker-python/tree/master/pandas/0.19/3/Dockerfile))* |
18-
| | `0.18-2`| *([0.18/2/Dockerfile](https://github.com/phirov/docker-python/tree/master/pandas/0.18/2/Dockerfile))* |
19-
| | `0.18-3`| *([0.18/3/Dockerfile](https://github.com/phirov/docker-python/tree/master/pandas/0.18/3/Dockerfile))* |
20-
|**scipyd**| `2`, `latest` | *([2/Dockerfile](https://github.com/phirov/docker-python/tree/master/scipy/2/Dockerfile))* |
21-
| | `3` | *([3/Dockerfile](https://github.com/phirov/docker-python/tree/master/scipy/3/Dockerfile))* |
22-
|**pocad** | `2`, `latest` | *([2/Dockerfile](https://github.com/phirov/docker-python/tree/master/pocad/2/Dockerfile))* |
23-
| | `3` | *([3/Dockerfile](https://github.com/phirov/docker-python/tree/master/pocad/3/Dockerfile))* |
17+
| | `0.19-3` | *([0.19/3/Dockerfile](https://github.com/phirov/docker-python/tree/master/pandas/0.19/3/Dockerfile))* |
18+
| | `0.18-2` | *([0.18/2/Dockerfile](https://github.com/phirov/docker-python/tree/master/pandas/0.18/2/Dockerfile))* |
19+
| | `0.18-3` | *([0.18/3/Dockerfile](https://github.com/phirov/docker-python/tree/master/pandas/0.18/3/Dockerfile))* |
20+
|**scipy** | `2`, `latest` | *([2/Dockerfile](https://github.com/phirov/docker-python/tree/master/scipy/2/Dockerfile))* |
21+
| | `3` | *([3/Dockerfile](https://github.com/phirov/docker-python/tree/master/scipy/3/Dockerfile))* |
22+
|**pocad** | `2`, `latest` | *([2/Dockerfile](https://github.com/phirov/docker-python/tree/master/pocad/2/Dockerfile))* |
23+
| | `3` | *([3/Dockerfile](https://github.com/phirov/docker-python/tree/master/pocad/3/Dockerfile))* |
24+
|**pluck** | `2`, `latest` | *([2/Dockerfile](https://github.com/phirov/docker-python/tree/master/pluck/2/Dockerfile))* |
25+
| | `3` | *([3/Dockerfile](https://github.com/phirov/docker-python/tree/master/pluck/3/Dockerfile))* |

‎deploy.sh‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎pluck/2/Dockerfile‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
FROM phirov/pandas:0.19-2
44
MAINTAINER phirov@163.com
55

6+
ENV PYMSSQL_BUILD_WITH_BUNDLED_FREETDS 1
7+
68
RUN apk add --no-cache \
79
--virtual .build-deps \
810
gcc \
@@ -11,11 +13,15 @@ RUN apk add --no-cache \
1113
python-dev \
1214
postgresql-dev \
1315
py-psycopg2 \
16+
freetds-dev \
1417
unixodbc-dev && \
15-
pip install pykafka && \
16-
pip install pymongo && \
17-
pip install pyodbc \
18-
psycopg2 && \
19-
pip install boto \
20-
boto3
18+
pip install pykafka \
19+
pymongo \
20+
boto \
21+
boto3 \
22+
pyodbc \
23+
psycopg2 \
24+
setuptools_git \
25+
rarfile && \
26+
pip install pymssql
2127
#apk del .build-deps

pluck/debug.sh renamed to pluck/script/debug.sh

File renamed without changes.

pluck/deploy.sh renamed to pluck/script/deploy.sh

File renamed without changes.

‎pluck/script/rm.sh‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/sh
2+
3+
IMAGE_NAME='phirov/pluck'
4+
5+
while [ 1 ]; do
6+
IMAGE_VERSION=`docker images | grep ${IMAGE_NAME} | tail -n 1 | awk '{print $2}'`
7+
if [ ${IMAGE_VERSION} ]; then
8+
echo "docker rmi ${IMAGE_NAME}:${IMAGE_VERSION}"
9+
docker rmi ${IMAGE_NAME}:${IMAGE_VERSION}
10+
else
11+
break
12+
fi
13+
done

pluck/run.sh renamed to pluck/script/run.sh

File renamed without changes.

debug.sh renamed to python/script/debug.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/sh
22

33
: ${IMAGE_NAME:=$1}
4-
: ${IMAGE_NAME:='phirov/scipy'}
4+
: ${IMAGE_NAME:='phirov/python'}
55
: ${APP_NAME:=$2}
6-
: ${APP_NAME:='scipy'}
6+
: ${APP_NAME:='python'}
77

88
echo "
99
docker run -it --rm --name ${APP_NAME} ${IMAGE_NAME} /bin/sh

‎python/script/deploy.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/sh
2+
3+
DF_PATH=$1
4+
: ${DF_PATH:='2'}
5+
6+
IMAGE_NAME=$2
7+
: ${IMAGE_NAME:='phirov/python'}
8+
9+
IMAGE_VERSION=$3
10+
: ${IMAGE_VERSION:=${DF_PATH}}
11+
12+
cd ${DF_PATH}
13+
docker rmi ${IMAGE_NAME} ${IMAGE_NAME}:${IMAGE_VERSION}
14+
docker build -t ${IMAGE_NAME} -t ${IMAGE_NAME}:${IMAGE_VERSION} .

‎python/script/rm.sh‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/sh
2+
3+
IMAGE_NAME='phirov/python'
4+
5+
while [ 1 ]; do
6+
IMAGE_VERSION=`docker images | grep ${IMAGE_NAME} | tail -n 1 | awk '{print $2}'`
7+
if [ ${IMAGE_VERSION} ]; then
8+
echo "docker rmi ${IMAGE_NAME}:${IMAGE_VERSION}"
9+
docker rmi ${IMAGE_NAME}:${IMAGE_VERSION}
10+
else
11+
break
12+
fi
13+
done

0 commit comments

Comments
 (0)