diff --git a/docker/base/Makefile.in b/docker/base/Makefile.in index 87f1889d..5fd5a2a7 100644 --- a/docker/base/Makefile.in +++ b/docker/base/Makefile.in @@ -38,7 +38,7 @@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -# docker.hub image. PLEASE CHANGE THIS IF YOU PUSH YOUR OWN +# docker.hub image. CHANGE THIS IF YOU PUSH YOUR OWN IMG = clixon/clixon # base image SHELL = /bin/sh diff --git a/docker/system/Dockerfile b/docker/system/Dockerfile index 1bcc0d76..8a011295 100644 --- a/docker/system/Dockerfile +++ b/docker/system/Dockerfile @@ -32,7 +32,6 @@ # # This application could use the base image, but it does not at this point. -#FROM olofhagsand/clixon FROM debian MAINTAINER Olof Hagsand diff --git a/docker/system/Makefile.in b/docker/system/Makefile.in index c18c47cc..19fb28db 100644 --- a/docker/system/Makefile.in +++ b/docker/system/Makefile.in @@ -38,7 +38,7 @@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -# Example docker image. PLEASE CHANGE THIS IF YOU PUSH +# Example docker image. CHANGE THIS IF YOU PUSH IMG = clixon/clixon-system SHELL = /bin/sh @@ -61,13 +61,14 @@ distclean: clean docker: clixon Dockerfile sudo docker build -t $(IMG) . # --no-cache +push: + sudo docker push $(IMG) + # Start the clixon system container and run the test script test: docker ./cleanup.sh ; PORT=8080 ./start.sh # kill (ignore error) and the start it sudo docker exec -it clixon-system bash -c 'cd /clixon/clixon/test && ./all.sh' -push: - depend: install-include: