Revert "Pr 19" ()

OMG
pull/13/merge
Christian Häussler 2016-06-23 23:07:52 +02:00 committed by GitHub
parent 86f075739f
commit cc4cd587eb
3 changed files with 2 additions and 14 deletions

View File

@ -7,18 +7,6 @@ ARG ARCH=amd64
ARG DOWNLOAD_URL="https://openhab.ci.cloudbees.com/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab-online/target/openhab-online-2.0.0-SNAPSHOT.zip"
ENV APPDIR="/openhab" OPENHAB_HTTP_PORT='8080' OPENHAB_HTTPS_PORT='8443' EXTRA_JAVA_OPTS=''
# Basic build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE
ARG VCS_REF
LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.docker.dockerfile="/Dockerfile" \
org.label-schema.license="EPL" \
org.label-schema.name="openHAB" \
org.label-schema.url="http://www.openhab.com/" \
org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-type="Git" \
org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git"
# Install Basepackages
RUN \
apt-get update && \

View File

@ -14,7 +14,7 @@ else
endif
build: tmp-$(TARGET)/Dockerfile
docker build --build-arg ARCH=$(TARGET) --build-arg DOWNLOAD_URL=$(DOWNLOAD_URL) --build-arg VCS_REF=`git rev-parse --short HEAD` --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -t $(DOCKER_REPO):$(TARGET)-$(FLAVOR) tmp-$(TARGET)
docker build --build-arg ARCH=$(TARGET) --build-arg DOWNLOAD_URL=$(DOWNLOAD_URL) -t $(DOCKER_REPO):$(TARGET)-$(FLAVOR) tmp-$(TARGET)
docker run --rm $(DOCKER_REPO):$(TARGET)-$(FLAVOR) uname -a
tmp-$(TARGET)/Dockerfile: Dockerfile $(shell find files)

View File

@ -1,6 +1,6 @@
# openHAB Docker Containers
[![Build state](https://travis-ci.org/openhab/openhab-docker.svg?branch=master)](https://travis-ci.org/openhab/openhab-docker) [![](https://imagelayers.io/badge/openhab/openhab:latest.svg)](https://imagelayers.io/?images=openhab/openhab:latest 'Get your own badge on imagelayers.io') [![](http://microbadger.com/#/images/openhab/openhab:amd64-offline)](https://microbadger.com/#/images/openhab/openhab:amd64-offline) [![Docker Stars](https://img.shields.io/docker/stars/openhab/openhab.svg?maxAge=2592000)](https://hub.docker.com/r/openhab/openhab/) [![Docker Pulls](https://img.shields.io/docker/pulls/openhab/openhab.svg?maxAge=2592000)](https://hub.docker.com/r/openhab/openhab/) [![Join the chat at https://gitter.im/openhab/openhab-docker](https://badges.gitter.im/openhab/openhab-docker.svg)](https://gitter.im/openhab/openhab-docker?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Build state](https://travis-ci.org/openhab/openhab-docker.svg?branch=master)](https://travis-ci.org/openhab/openhab-docker) [![](https://imagelayers.io/badge/openhab/openhab:latest.svg)](https://imagelayers.io/?images=openhab/openhab:latest 'Get your own badge on imagelayers.io') [![Docker Stars](https://img.shields.io/docker/stars/openhab/openhab.svg?maxAge=2592000)](https://hub.docker.com/r/openhab/openhab/) [![Docker Pulls](https://img.shields.io/docker/pulls/openhab/openhab.svg?maxAge=2592000)](https://hub.docker.com/r/openhab/openhab/) [![Join the chat at https://gitter.im/openhab/openhab-docker](https://badges.gitter.im/openhab/openhab-docker.svg)](https://gitter.im/openhab/openhab-docker?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Repository for building docker containers for [openHAB](http://openhab.org) (Home Automation Server).