Skip to content

Commit

Permalink
Adjust docker image namespace.
Browse files Browse the repository at this point in the history
  • Loading branch information
hannosch committed Dec 1, 2015
1 parent d4649a0 commit b42b230
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
@@ -1,4 +1,4 @@
FROM mozilla-ichnaea-python:latest
FROM mozilla-ichnaea/python:latest
MAINTAINER Mozilla Geolocation <dev-geolocation@lists.mozilla.org>
ENV PYTHONUNBUFFERED 1

Expand Down
18 changes: 11 additions & 7 deletions Makefile
Expand Up @@ -78,25 +78,29 @@ UGLIFYJS = cd $(JS_ROOT) && $(NODE_BIN)/uglifyjs


.PHONY: all bower js mysql pip init_db css js test clean shell docs \
docker docker-images \
docker docker-images docker-images-dev \
build build_dev build_req build_cython \
build_datamaps build_maxmind build_pngquant \
release release_install release_compile \
tox_install tox_test pypi_release pypi_upload

all: build init_db

docker:
docker: docker-images
ifneq ($(TRAVIS), true)
cd $(TOXINIDIR); docker-compose up -d
endif

docker-images:
cd docker/mysql; docker build -t mozilla-ichnaea-mysql:latest .
cd docker/redis; docker build -t mozilla-ichnaea-redis:latest .
cd docker/os; docker build -t mozilla-ichnaea-os:latest .
cd docker/python; docker build -t mozilla-ichnaea-python:latest .
docker build -t mozilla-ichnaea-dev:latest .
ifneq ($(TRAVIS), true)
cd docker/mysql; docker build -t mozilla-ichnaea/mysql:latest .
cd docker/redis; docker build -t mozilla-ichnaea/redis:latest .
endif

docker-images-dev:
cd docker/os; docker build -t mozilla-ichnaea/os:latest .
cd docker/python; docker build -t mozilla-ichnaea/python:latest .
docker build -t mozilla-ichnaea/dev:latest .

mysql: docker
ifeq ($(TRAVIS), true)
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
@@ -1,11 +1,11 @@
mysql:
build: docker/mysql
image: mozilla-ichnaea/mysql:latest
container_name: mozilla-ichnaea-mysql
ports:
- "33306:3306"

redis:
build: docker/redis
image: mozilla-ichnaea/redis:latest
container_name: mozilla-ichnaea-redis
ports:
- "36379:6379"
2 changes: 1 addition & 1 deletion docker/python/Dockerfile
@@ -1,4 +1,4 @@
FROM mozilla-ichnaea-os:latest
FROM mozilla-ichnaea/os:latest
MAINTAINER Mozilla Geolocation <dev-geolocation@lists.mozilla.org>
ENV PYTHONUNBUFFERED 1

Expand Down

0 comments on commit b42b230

Please sign in to comment.