mir/alpine-searx
2
0
Fork 0
mirror of https://github.com/woahbase/alpine-searx synced 2025-08-22 09:57:10 +00:00
Code Issues Releases Wiki Activity

customize container name, compliance with latest tag, update readme

Browse Source
This commit is contained in:
lapnapra 2018-02-06 03:45:38 +05:30
parent eb4f6b5925
commit 7a2ed19177
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -14,7 +14,7 @@ the [s6][133] init system [overlayed][134] in it.
The image is tagged respectively for the following architectures,
* **armhf**
* **x86_64**
* **x86_64** (retagged as the `latest` )
**armhf** builds have embedded binfmt_misc support and contain the
[qemu-user-static][105] binary that allows for running it also inside

24
makefile
View File

@ -14,6 +14,8 @@ DOCKERSRC := $(OPSYS)-python3#
DOCKEREPO := $(OPSYS)-$(SVCNAME)
IMAGETAG := $(USERNAME)/$(DOCKEREPO):$(ARCH)
CNTNAME := $(SVCNAME) # name for container name : docker_name, hostname : name
# -- }}}
# {{{ -- flags
@ -35,7 +37,7 @@ BUILDFLAGS := --rm --force-rm --compress -f $(CURDIR)/Dockerfile_$(ARCH) -t $(IM
CACHEFLAGS := --no-cache=true --pull
MOUNTFLAGS := -v $(CURDIR)/data:/data
NAMEFLAGS := --name docker_$(SVCNAME) --hostname $(SVCNAME)
NAMEFLAGS := --name docker_$(CNTNAME) --hostname $(CNTNAME)
OTHERFLAGS := -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro # -e TZ=Asia/Kolkata
PORTFLAGS := -p 8888:8888
PROXYFLAGS := --build-arg http_proxy=$(http_proxy) --build-arg https_proxy=$(https_proxy) --build-arg no_proxy=$(no_proxy)
@ -57,31 +59,37 @@ clean :
docker images | awk '(NR>1) && ($$2!~/none/) {print $$1":"$$2}' | grep "$(USERNAME)/$(DOCKEREPO)" | xargs -n1 docker rmi
logs :
docker logs -f docker_$(SVCNAME)
docker logs -f docker_$(CNTNAME)
pull :
docker pull $(IMAGETAG)
push :
docker push $(IMAGETAG)
docker push $(IMAGETAG); \
if [ "$(ARCH)" = "$(HOSTARCH)" ]; \
then \
LATESTTAG=$$(echo $(IMAGETAG) | sed 's/:$(ARCH)/:latest/'); \
docker tag $(IMAGETAG) $${LATESTTAG}; \
docker push $${LATESTTAG}; \
fi;
restart :
docker ps -a | grep 'docker_$(SVCNAME)' -q && docker restart docker_$(SVCNAME) || echo "Service not running.";
docker ps -a | grep 'docker_$(CNTNAME)' -q && docker restart docker_$(CNTNAME) || echo "Service not running.";
rm : stop
docker rm -f docker_$(SVCNAME)
docker rm -f docker_$(CNTNAME)
run :
docker run --rm -it $(NAMEFLAGS) $(RUNFLAGS) $(PORTFLAGS) $(MOUNTFLAGS) $(OTHERFLAGS) $(IMAGETAG)
rshell :
docker exec -u root -it docker_$(SVCNAME) $(SHCOMMAND)
docker exec -u root -it docker_$(CNTNAME) $(SHCOMMAND)
shell :
docker exec -it docker_$(SVCNAME) $(SHCOMMAND)
docker exec -it docker_$(CNTNAME) $(SHCOMMAND)
stop :
docker stop -t 2 docker_$(SVCNAME)
docker stop -t 2 docker_$(CNTNAME)
test :
docker run --rm -it $(NAMEFLAGS) $(RUNFLAGS) $(PORTFLAGS) $(MOUNTFLAGS) $(OTHERFLAGS) $(IMAGETAG) sh -ec 'sleep 15; python -V'