Skip to content

Commit d1517e0

Browse files
authored
add package task (#24)
1 parent 7245dcd commit d1517e0

File tree

3 files changed

+20
-13
lines changed

3 files changed

+20
-13
lines changed

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
.git
2-
plugin
2+
splunk-log-plugin

.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
plugin
1+
splunk-log-plugin
2+
splunk-log-plugin.tar.gz
23
.idea/
3-
*.pyc
4+
.DS_Store
5+
*.pyc

Makefile

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,36 @@
11
PLUGIN_NAME=splunk-log-plugin
22
PLUGIN_TAG=latest
3+
PLUGIN_DIR=./splunk-log-plugin
34

45
all: clean docker rootfs create
6+
package: clean docker rootfs zip
57

68
clean:
7-
@echo "### rm ./plugin"
8-
rm -rf ./plugin
9+
@echo "### rm ${PLUGIN_DIR}"
10+
rm -rf ${PLUGIN_DIR}
911

1012
docker:
1113
@echo "### docker build: rootfs image with splunk-log-plugin"
1214
docker build -t ${PLUGIN_NAME}:rootfs .
1315

1416
rootfs:
15-
@echo "### create rootfs directory in ./plugin/rootfs"
16-
mkdir -p ./plugin/rootfs
17+
@echo "### create rootfs directory in ${PLUGIN_DIR}/rootfs"
18+
mkdir -p ${PLUGIN_DIR}/rootfs
1719
docker create --name tmprootfs ${PLUGIN_NAME}:rootfs
18-
docker export tmprootfs | tar -x -C ./plugin/rootfs
19-
@echo "### copy config.json to ./plugin/"
20-
cp config.json ./plugin/
20+
docker export tmprootfs | tar -x -C ${PLUGIN_DIR}/rootfs
21+
@echo "### copy config.json to ${PLUGIN_DIR}/"
22+
cp config.json ${PLUGIN_DIR}/
2123
docker rm -vf tmprootfs
2224

2325
create:
2426
@echo "### remove existing plugin ${PLUGIN_NAME}:${PLUGIN_TAG} if exists"
2527
docker plugin rm -f ${PLUGIN_NAME}:${PLUGIN_TAG} || true
26-
@echo "### create new plugin ${PLUGIN_NAME}:${PLUGIN_TAG} from ./plugin"
27-
docker plugin create ${PLUGIN_NAME}:${PLUGIN_TAG} ./plugin
28+
@echo "### create new plugin ${PLUGIN_NAME}:${PLUGIN_TAG} from ${PLUGIN_DIR}"
29+
docker plugin create ${PLUGIN_NAME}:${PLUGIN_TAG} ${PLUGIN_DIR}
30+
31+
zip:
32+
@echo "### create a tar.gz for plugin"
33+
tar -cvzf ${PLUGIN_NAME}.tar.gz ${PLUGIN_DIR}
2834

2935
enable:
3036
@echo "### enable plugin ${PLUGIN_NAME}:${PLUGIN_TAG}"
@@ -33,4 +39,3 @@ enable:
3339
push: clean docker rootfs create enable
3440
@echo "### push plugin ${PLUGIN_NAME}:${PLUGIN_TAG}"
3541
docker plugin push ${PLUGIN_NAME}:${PLUGIN_TAG}
36-

0 commit comments

Comments
 (0)