Rename base images, push to 0xacab registry

3 files changed, 14 insertions, 15 deletions

diff --git a/docker/README.md b/docker/README.md
index 64b0cd1..454a681 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,25 +1,24 @@
 # Build new image
 
-As an example we build a new version (2.2.0) of the leapcode/jessie base image:
+As an example we build a new version of the `leap:jessie` base image:
 
-    IMAGE='jessie'
+    REGISTRY="0xacab.org:4567"
+    REGISTRY_PATH="${REGISTRY}/leap/gitlab-buildpackage"
+    IMAGE='jessie_amd64'
 
-## Find latest version
-
-I.e. look at the tags at https://hub.docker.com/r/leapcode/ruby/tags/ or query tags with:
+    cd $IMAGE
+    docker ${DOCKER_OPTS} build ${DOCKER_BUILD_OPTS} -t ${REGISTRY_PATH}:${IMAGE} .
 
-    curl -s https://registry.hub.docker.com/v2/repositories/leapcode/$IMAGE/tags/ |jq '."results"[]["name"]'
+## Package upgrades
 
-## Build new version
+Sometimes you need to upgrade packages in the base image,
+so this is not done on every build, i.e. when security updates
+are available.
+Disable caching and build new images with:
 
-    VERSION='1.5'
-    cd $IMAGE
-    docker build --no-cache -t leapcode/${IMAGE}:${VERSION} .
+    export DOCKER_BUILD_OPTS="--no-cache"
 
 ## Push images
 
-    docker logout
-    docker login -u leapcode
-    docker tag  leapcode/${IMAGE}:${VERSION} leapcode/${IMAGE}:latest
-    docker push leapcode/${IMAGE}:latest
-    docker push leapcode/${IMAGE}:${VERSION}
+    docker login --username=varac 0xacab.org:4567
+    docker ${DOCKER_OPTS} push ${REGISTRY_PATH}:${IMAGE}
diff --git a/docker/jessie/Dockerfile b/docker/jessie_amd64/Dockerfile
index d63d771..d63d771 100644
--- a/docker/jessie/Dockerfile
+++ b/docker/jessie_amd64/Dockerfile
diff --git a/docker/stretch/Dockerfile b/docker/stretch_amd64/Dockerfile
index 2db107b..2db107b 100644
--- a/docker/stretch/Dockerfile
+++ b/docker/stretch_amd64/Dockerfile