From 78390c6936a0144ca37f857792f193b328314348 Mon Sep 17 00:00:00 2001
From: Andrew Chin <achin@eminence32.net>
Date: Sun, 4 Mar 2018 16:18:42 -0500
Subject: [PATCH] Updated to new gitlab registry URL

---
 .gitlab-ci.yml                                | 20 +++++++++----------
 build-tools/dockerfiles/base/Makefile         |  6 +++---
 build-tools/dockerfiles/centos6/Makefile      |  6 +++---
 build-tools/dockerfiles/centos7/Dockerfile    |  2 +-
 build-tools/dockerfiles/centos7/Makefile      |  6 +++---
 build-tools/dockerfiles/debian64/Makefile     |  9 ++++++---
 build-tools/dockerfiles/src/Dockerfile        |  2 +-
 .../dockerfiles/verify-centos7/Makefile       |  6 +++---
 .../dockerfiles/verify-debian/Makefile        |  6 +++---
 9 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54c0d83..c331e2f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ variables:
   MC_VERSION: "1.12"
 
 build:linux:
-  image: code.em32.net:14567/overviewer/minecraft-overviewer:base
+  image: registry.code.em32.net/overviewer/minecraft-overviewer:base
   stage: build
   dependencies: []
   tags:
@@ -44,7 +44,7 @@ build:windows:
 
 
 build:docs:
-  image: code.em32.net:14567/overviewer/minecraft-overviewer:base
+  image: registry.code.em32.net/overviewer/minecraft-overviewer:base
   stage: build
   dependencies: []
   tags:
@@ -59,7 +59,7 @@ build:docs:
       - docs/_build/html/
 
 test:
-  image: code.em32.net:14567/overviewer/minecraft-overviewer:base
+  image: registry.code.em32.net/overviewer/minecraft-overviewer:base
   stage: test
   dependencies: []
   tags:
@@ -77,7 +77,7 @@ test:
 
 
 render:
-  image: code.em32.net:14567/overviewer/minecraft-overviewer:base
+  image: registry.code.em32.net/overviewer/minecraft-overviewer:base
   stage: test
   dependencies: []
   tags:
@@ -105,7 +105,7 @@ render:
 
 # Builds a source package
 package:src:
-  image: code.em32.net:14567/overviewer/minecraft-overviewer:base
+  image: registry.code.em32.net/overviewer/minecraft-overviewer:base
   stage: package
   dependencies: []
   tags:
@@ -120,7 +120,7 @@ package:src:
       - Minecraft-Overviewer*.tar.gz
 
 package:centos7rpm:
-  image: code.em32.net:14567/overviewer/minecraft-overviewer:centos7
+  image: registry.code.em32.net/overviewer/minecraft-overviewer:centos7
   stage: package
   dependencies: []
   tags:
@@ -142,7 +142,7 @@ package:centos7rpm:
       - Minecraft-Overviewer*.x86_64.rpm
 
 package:centos7-32rpm:
-  image: code.em32.net:14567/overviewer/minecraft-overviewer:centos7
+  image: registry.code.em32.net/overviewer/minecraft-overviewer:centos7
   stage: package
   dependencies: []
   tags:
@@ -168,7 +168,7 @@ package:centos7-32rpm:
 
 # Note that even though we are building a centos6 rpm, we can still use the centos7 docker image
 package:centos6rpm:
-  image: code.em32.net:14567/overviewer/minecraft-overviewer:centos7
+  image: registry.code.em32.net/overviewer/minecraft-overviewer:centos7
   stage: package
   dependencies: []
   tags:
@@ -193,7 +193,7 @@ package:centos6rpm:
       - Minecraft-Overviewer*.x86_64.rpm
 
 package:debian64:
-  image: code.em32.net:14567/overviewer/minecraft-overviewer:debian64
+  image: registry.code.em32.net/overviewer/minecraft-overviewer:debian64
   stage: package
   dependencies: []
   tags:
@@ -263,7 +263,7 @@ package:win32:
       - overviewer-win32-*.zip
 
 verify:centos7:
-  image: code.em32.net:14567/overviewer/minecraft-overviewer:centos7-verify
+  image: registry.code.em32.net/overviewer/minecraft-overviewer:centos7-verify
   stage: verify
   tags:
     - docker
diff --git a/build-tools/dockerfiles/base/Makefile b/build-tools/dockerfiles/base/Makefile
index c1b6dbb..126f1b4 100644
--- a/build-tools/dockerfiles/base/Makefile
+++ b/build-tools/dockerfiles/base/Makefile
@@ -1,9 +1,9 @@
 build:
-	docker build -t code.em32.net:14567/overviewer/minecraft-overviewer:base . 
+	docker build -t registry.code.em32.net/overviewer/minecraft-overviewer:base . 
 
 push:
-	docker push code.em32.net:14567/overviewer/minecraft-overviewer:base
+	docker push registry.code.em32.net/overviewer/minecraft-overviewer:base
 
 run:
-	docker run --rm -it code.em32.net:14567/overviewer/minecraft-overviewer:base /bin/bash
+	docker run --rm -it registry.code.em32.net/overviewer/minecraft-overviewer:base /bin/bash
 
diff --git a/build-tools/dockerfiles/centos6/Makefile b/build-tools/dockerfiles/centos6/Makefile
index eeda8ad..f1027a0 100644
--- a/build-tools/dockerfiles/centos6/Makefile
+++ b/build-tools/dockerfiles/centos6/Makefile
@@ -1,11 +1,11 @@
 tag=centos6
 
 build:
-	docker build -t code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) . 
+	docker build -t registry.code.em32.net/overviewer/minecraft-overviewer:$(tag) --no-cache . 
 
 push:
-	docker push code.em32.net:14567/overviewer/minecraft-overviewer:$(tag)
+	docker push registry.code.em32.net/overviewer/minecraft-overviewer:$(tag)
 
 run:
-	docker run --rm --privileged -it code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) /bin/bash
+	docker run --rm --privileged -it registry.code.em32.net/overviewer/minecraft-overviewer:$(tag) /bin/bash
 
diff --git a/build-tools/dockerfiles/centos7/Dockerfile b/build-tools/dockerfiles/centos7/Dockerfile
index 80fca44..0f2f1cb 100644
--- a/build-tools/dockerfiles/centos7/Dockerfile
+++ b/build-tools/dockerfiles/centos7/Dockerfile
@@ -1,4 +1,4 @@
-FROM code.em32.net:14567/overviewer/minecraft-overviewer:base
+FROM registry.code.em32.net/overviewer/minecraft-overviewer:base
 RUN yum -y install mock
 RUN useradd --create-home --groups mock overviewer
 USER overviewer
diff --git a/build-tools/dockerfiles/centos7/Makefile b/build-tools/dockerfiles/centos7/Makefile
index 6d3f08f..98f5421 100644
--- a/build-tools/dockerfiles/centos7/Makefile
+++ b/build-tools/dockerfiles/centos7/Makefile
@@ -1,11 +1,11 @@
 tag=centos7
 
 build:
-	docker build -t code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) . 
+	docker build -t registry.code.em32.net/overviewer/minecraft-overviewer:$(tag) --no-cache . 
 
 push:
-	docker push code.em32.net:14567/overviewer/minecraft-overviewer:$(tag)
+	docker push registry.code.em32.net/overviewer/minecraft-overviewer:$(tag)
 
 run:
-	docker run --rm --privileged -it code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) /bin/bash
+	docker run --rm --privileged -it registry.code.em32.net/overviewer/minecraft-overviewer:$(tag) /bin/bash
 
diff --git a/build-tools/dockerfiles/debian64/Makefile b/build-tools/dockerfiles/debian64/Makefile
index cb3f628..f17ee5e 100644
--- a/build-tools/dockerfiles/debian64/Makefile
+++ b/build-tools/dockerfiles/debian64/Makefile
@@ -1,11 +1,14 @@
 tag=debian64
 
 build:
-	docker build -t code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) . 
+	docker build -t registry.code.em32.net/overviewer/minecraft-overviewer:$(tag) . 
+
+forcebuild:
+	docker build --no-cache -t registry.code.em32.net/overviewer/minecraft-overviewer:$(tag) . 
 
 push:
-	docker push code.em32.net:14567/overviewer/minecraft-overviewer:$(tag)
+	docker push registry.code.em32.net/overviewer/minecraft-overviewer:$(tag)
 
 run:
-	docker run --rm --privileged -it code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) /bin/bash
+	docker run --rm --privileged -it registry.code.em32.net/overviewer/minecraft-overviewer:$(tag) /bin/bash
 
diff --git a/build-tools/dockerfiles/src/Dockerfile b/build-tools/dockerfiles/src/Dockerfile
index b24bf05..9bd226d 100644
--- a/build-tools/dockerfiles/src/Dockerfile
+++ b/build-tools/dockerfiles/src/Dockerfile
@@ -1 +1 @@
-FROM code.em32.net:14567/overviewer/minecraft-overviewer
+FROM registry.code.em32.net/overviewer/minecraft-overviewer
diff --git a/build-tools/dockerfiles/verify-centos7/Makefile b/build-tools/dockerfiles/verify-centos7/Makefile
index e20b9ef..688389c 100644
--- a/build-tools/dockerfiles/verify-centos7/Makefile
+++ b/build-tools/dockerfiles/verify-centos7/Makefile
@@ -1,11 +1,11 @@
 tag=centos7-verify
 
 build:
-	docker build -t code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) . 
+	docker build -t registry.code.em32.net/overviewer/minecraft-overviewer:$(tag) --no-cache . 
 
 push:
-	docker push code.em32.net:14567/overviewer/minecraft-overviewer:$(tag)
+	docker push registry.code.em32.net/overviewer/minecraft-overviewer:$(tag)
 
 run:
-	docker run --rm -it code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) /bin/bash
+	docker run --rm -it registry.code.em32.net/overviewer/minecraft-overviewer:$(tag) /bin/bash
 
diff --git a/build-tools/dockerfiles/verify-debian/Makefile b/build-tools/dockerfiles/verify-debian/Makefile
index f528643..9401ea8 100644
--- a/build-tools/dockerfiles/verify-debian/Makefile
+++ b/build-tools/dockerfiles/verify-debian/Makefile
@@ -1,11 +1,11 @@
 tag=debian-verify
 
 build:
-	docker build -t code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) . 
+	docker build -t registry.code.em32.net/overviewer/minecraft-overviewer:$(tag) --no-cache . 
 
 push:
-	docker push code.em32.net:14567/overviewer/minecraft-overviewer:$(tag)
+	docker push registry.code.em32.net/overviewer/minecraft-overviewer:$(tag)
 
 run:
-	docker run --rm -it code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) /bin/bash
+	docker run --rm -it registry.code.em32.net/overviewer/minecraft-overviewer:$(tag) /bin/bash