LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Updated to new gitlab registry URL

Browse Source
This commit is contained in:
Andrew Chin
2018-03-04 16:18:42 -05:00
parent f28c4ce680
commit 78390c6936
9 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.gitlab-ci.yml
View File

@@ -11,7 +11,7 @@ variables:
MC_VERSION: "1.12" MC_VERSION: "1.12"
build:linux: build:linux:
image: code.em32.net:14567/overviewer/minecraft-overviewer:base image: registry.code.em32.net/overviewer/minecraft-overviewer:base
stage: build stage: build
dependencies: [] dependencies: []
tags: tags:
@@ -44,7 +44,7 @@ build:windows:
build:docs: build:docs:
image: code.em32.net:14567/overviewer/minecraft-overviewer:base image: registry.code.em32.net/overviewer/minecraft-overviewer:base
stage: build stage: build
dependencies: [] dependencies: []
tags: tags:
@@ -59,7 +59,7 @@ build:docs:
- docs/_build/html/ - docs/_build/html/
test: test:
image: code.em32.net:14567/overviewer/minecraft-overviewer:base image: registry.code.em32.net/overviewer/minecraft-overviewer:base
stage: test stage: test
dependencies: [] dependencies: []
tags: tags:
@@ -77,7 +77,7 @@ test:
render: render:
image: code.em32.net:14567/overviewer/minecraft-overviewer:base image: registry.code.em32.net/overviewer/minecraft-overviewer:base
stage: test stage: test
dependencies: [] dependencies: []
tags: tags:
@@ -105,7 +105,7 @@ render:
# Builds a source package # Builds a source package
package:src: package:src:
image: code.em32.net:14567/overviewer/minecraft-overviewer:base image: registry.code.em32.net/overviewer/minecraft-overviewer:base
stage: package stage: package
dependencies: [] dependencies: []
tags: tags:
@@ -120,7 +120,7 @@ package:src:
- Minecraft-Overviewer*.tar.gz - Minecraft-Overviewer*.tar.gz
package:centos7rpm: package:centos7rpm:
image: code.em32.net:14567/overviewer/minecraft-overviewer:centos7 image: registry.code.em32.net/overviewer/minecraft-overviewer:centos7
stage: package stage: package
dependencies: [] dependencies: []
tags: tags:
@@ -142,7 +142,7 @@ package:centos7rpm:
- Minecraft-Overviewer*.x86_64.rpm - Minecraft-Overviewer*.x86_64.rpm
package:centos7-32rpm: package:centos7-32rpm:
image: code.em32.net:14567/overviewer/minecraft-overviewer:centos7 image: registry.code.em32.net/overviewer/minecraft-overviewer:centos7
stage: package stage: package
dependencies: [] dependencies: []
tags: 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 # Note that even though we are building a centos6 rpm, we can still use the centos7 docker image
package:centos6rpm: package:centos6rpm:
image: code.em32.net:14567/overviewer/minecraft-overviewer:centos7 image: registry.code.em32.net/overviewer/minecraft-overviewer:centos7
stage: package stage: package
dependencies: [] dependencies: []
tags: tags:
@@ -193,7 +193,7 @@ package:centos6rpm:
- Minecraft-Overviewer*.x86_64.rpm - Minecraft-Overviewer*.x86_64.rpm
package:debian64: package:debian64:
image: code.em32.net:14567/overviewer/minecraft-overviewer:debian64 image: registry.code.em32.net/overviewer/minecraft-overviewer:debian64
stage: package stage: package
dependencies: [] dependencies: []
tags: tags:
@@ -263,7 +263,7 @@ package:win32:
- overviewer-win32-*.zip - overviewer-win32-*.zip
verify:centos7: verify:centos7:
image: code.em32.net:14567/overviewer/minecraft-overviewer:centos7-verify image: registry.code.em32.net/overviewer/minecraft-overviewer:centos7-verify
stage: verify stage: verify
tags: tags:
- docker - docker

6
build-tools/dockerfiles/base/Makefile
View File

@@ -1,9 +1,9 @@
build: build:
docker build -t code.em32.net:14567/overviewer/minecraft-overviewer:base . docker build -t registry.code.em32.net/overviewer/minecraft-overviewer:base .
push: push:
docker push code.em32.net:14567/overviewer/minecraft-overviewer:base docker push registry.code.em32.net/overviewer/minecraft-overviewer:base
run: 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

6
build-tools/dockerfiles/centos6/Makefile
View File

@@ -1,11 +1,11 @@
tag=centos6 tag=centos6
build: 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: push:
docker push code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) docker push registry.code.em32.net/overviewer/minecraft-overviewer:$(tag)
run: 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

2
build-tools/dockerfiles/centos7/Dockerfile
View File

@@ -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 yum -y install mock
RUN useradd --create-home --groups mock overviewer RUN useradd --create-home --groups mock overviewer
USER overviewer USER overviewer

6
build-tools/dockerfiles/centos7/Makefile
View File

@@ -1,11 +1,11 @@
tag=centos7 tag=centos7
build: 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: push:
docker push code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) docker push registry.code.em32.net/overviewer/minecraft-overviewer:$(tag)
run: 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

9
build-tools/dockerfiles/debian64/Makefile
View File

@@ -1,11 +1,14 @@
tag=debian64 tag=debian64
build: 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: push:
docker push code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) docker push registry.code.em32.net/overviewer/minecraft-overviewer:$(tag)
run: 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

2
build-tools/dockerfiles/src/Dockerfile
View File

@@ -1 +1 @@
FROM code.em32.net:14567/overviewer/minecraft-overviewer FROM registry.code.em32.net/overviewer/minecraft-overviewer

6
build-tools/dockerfiles/verify-centos7/Makefile
View File

@@ -1,11 +1,11 @@
tag=centos7-verify tag=centos7-verify
build: 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: push:
docker push code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) docker push registry.code.em32.net/overviewer/minecraft-overviewer:$(tag)
run: 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

6
build-tools/dockerfiles/verify-debian/Makefile
View File

@@ -1,11 +1,11 @@
tag=debian-verify tag=debian-verify
build: 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: push:
docker push code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) docker push registry.code.em32.net/overviewer/minecraft-overviewer:$(tag)
run: 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