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

docker update

Browse Source
This commit is contained in:
Jan Halfar 2017-01-06 22:33:59 +01:00
parent 39245eaea8
commit 603e604467
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -5,7 +5,9 @@ COPY bin/contentserver-linux-amd64 /usr/sbin/contentserver
# install ca root certificates # install ca root certificates
# https://curl.haxx.se/docs/caextract.html # https://curl.haxx.se/docs/caextract.html
# http://blog.codeship.com/building-minimal-docker-containers-for-go-applications/ # http://blog.codeship.com/building-minimal-docker-containers-for-go-applications/
ADD https://curl.haxx.se/ca/cacert.pem /etc/ssl/certs/ca-certificates.crt # does not work on docker for mac :(
# ADD https://curl.haxx.se/ca/cacert.pem /etc/ssl/certs/ca-certificates.crt
ADD .cacert.pem /etc/ssl/certs/ca-certificates.crt
ENV CONTENT_SERVER_LOG_LEVEL=error ENV CONTENT_SERVER_LOG_LEVEL=error
ENV CONTENT_SERVER_ADDR=0.0.0.0:80 ENV CONTENT_SERVER_ADDR=0.0.0.0:80

4
Makefile
View File

@ -11,10 +11,12 @@ build-arch: clean
GOOS=linux GOARCH=amd64 go build -o bin/contentserver-linux-amd64 GOOS=linux GOARCH=amd64 go build -o bin/contentserver-linux-amd64
GOOS=darwin GOARCH=amd64 go build -o bin/contentserver-darwin-amd64 GOOS=darwin GOARCH=amd64 go build -o bin/contentserver-darwin-amd64
build-docker: clean build-arch build-docker: clean build-arch
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` docker-registry.bestbytes.net/contentserver:$(TAG)
echo "# tagged container `cat .image_id` as docker-registry.bestbytes.net/contentserver:$(TAG)" echo "# tagged container `cat .image_id` as docker-registry.bestbytes.net/contentserver:$(TAG)"
rm -f .image_id rm -vf .image_id .cacert.pem
package: build package: build
pkg/build.sh pkg/build.sh
test: test: