foomo/contentserver
1
0
Fork 0
mirror of https://github.com/foomo/contentserver.git synced 2025-10-16 12:25:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: add correct expose file and better makefile

Browse Source
This commit is contained in:
Stefan Martinov 2019-05-08 18:04:58 +02:00
parent 6b891e7f0f
commit d0e9a2966a
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -29,9 +29,9 @@ COPY --from=build-env /contentserver /usr/sbin/contentserver
VOLUME $CONTENT_SERVER_VAR_DIR VOLUME $CONTENT_SERVER_VAR_DIR
EXPOSE 80
EXPOSE 9200 ## Prometheus Listener
ENTRYPOINT ["/usr/sbin/contentserver"] ENTRYPOINT ["/usr/sbin/contentserver"]
CMD ["-address=$CONTENT_SERVER_ADDR", "-log-level=$CONTENT_SERVER_LOG_LEVEL", "-var-dir=$CONTENT_SERVER_VAR_DIR"] CMD ["-address=$CONTENT_SERVER_ADDR", "-log-level=$CONTENT_SERVER_LOG_LEVEL", "-var-dir=$CONTENT_SERVER_VAR_DIR"]
EXPOSE 80
EXPOSE 9200

13
Makefile
View File

@ -1,6 +1,7 @@
SHELL := /bin/bash SHELL := /bin/bash
TAG=`git describe --exact-match --tags $(git log -n1 --pretty='%h') 2>/dev/null || git rev-parse --abbrev-ref HEAD` TAG?=latest
IMAGE=docker-registry.bestbytes.net/contentserver
all: build test all: build test
tag: tag:
@ -15,11 +16,17 @@ build-arch: clean
build-docker: clean build-arch build-docker: clean build-arch
curl https://curl.haxx.se/ca/cacert.pem > .cacert.pem curl https://curl.haxx.se/ca/cacert.pem > .cacert.pem
docker build -q . > .image_id docker build -q . > .image_id
docker tag `cat .image_id` docker-registry.bestbytes.net/contentserver:$(TAG) docker tag `cat .image_id` $(IMAGE):$(TAG)
echo "# tagged container `cat .image_id` as docker-registry.bestbytes.net/contentserver:$(TAG)" echo "# tagged container `cat .image_id` as $(IMAGE):$(TAG)"
rm -vf .image_id .cacert.pem rm -vf .image_id .cacert.pem
package: build package: build
pkg/build.sh pkg/build.sh
test: test:
go test ./... go test ./...
docker-build:
docker build -t $(IMAGE):$(TAG) .
docker-push:
docker push $(IMAGE):$(TAG)