Change to gitlab container registry

.gitlab-ci.yml

@@ -9,7 +9,8 @@ cache:
 build:
   stage: build
   script:
-    - ./build-docker.sh docker2.touhou.fm
+    - buildah login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - ./build-docker.sh $CI_REGISTRY_IMAGE
   after_script:
     - chmod u+rwx .go -R
   artifacts:
@@ -36,7 +37,7 @@ deploy:
   script:
     - git config --global user.email "$GITLAB_USER_EMAIL"
     - git config --global user.name "$GITLAB_USER_NAME"
-    - git clone ssh://gitlab@git.touhou.fm:7222/touhou.fm/radio-go/infra/radio.git
+    - git clone ssh://gitlab@git.sonck.nl:7222/touhou.fm/radio-go/infra/radio.git
     - cd radio
     - git checkout ci/update-version
     - cp ../playlist.version.auto.tfvars ./

build-docker.sh

@@ -41,6 +41,6 @@ buildah rm "${C}"
 C=$(buildah from scratch || exit 1)
 buildah copy "${C}" "${PWD}/target/output/playlist" /playlist || on_fail
 buildah config --port 2001 --entrypoint '["/playlist"]' --cmd 'start --config /config/playlist.yml' "${C}"
-buildah commit "${C}" "$1/thfmr/playlist:$VERSION" || on_fail
-buildah push "$1/thfmr/playlist:$VERSION" "docker://$1/thfmr/playlist:$VERSION"
+buildah commit "${C}" "$1:$VERSION" || on_fail
+buildah push "$1:$VERSION" "docker://$1:$VERSION"
 buildah rm "${C}"