From 06fba07a0611cadacbadc5f2b58c7d486fd6fd42 Mon Sep 17 00:00:00 2001 From: jak1 Date: Tue, 21 Jun 2022 14:10:01 +0200 Subject: rename to the new gitlab instance, and using the ci namespace variable add docker_build.sh (build without env.vars) --- Dockerfile | 2 +- docker_build.sh | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100755 docker_build.sh diff --git a/Dockerfile b/Dockerfile index fca5eed..711fb71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,7 +42,7 @@ RUN apt-get install -y\ USER root WORKDIR / -RUN git clone https://gitlab.com/themanaworld/manaplus/docker-windows-builder.git opt/ +RUN git clone https://git.themanaworld.org/${CI_PROJECT_NAMESPACE}/docker-windows-builder.git opt/ RUN rm -rf /opt/.git/ RUN mv opt/* / diff --git a/docker_build.sh b/docker_build.sh new file mode 100755 index 0000000..1bdb617 --- /dev/null +++ b/docker_build.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +CI_MODE="release" +if [[ "$CI_PROJECT_NAMESPACE" == "" ]]; then + if [[ $1 == "test" ]]; then + export CI_PROJECT_NAMESPACE="jak1" + export CI_MODE="test" + else + export CI_PROJECT_NAMESPACE="mana" + fi +else + export CI_PROJECT_NAMESPACE="mana" +fi + +echo "[build] mode: $CI_MODE" +echo "[build] repo: https://git.themanaworld.org/${CI_PROJECT_NAMESPACE}/docker-windows-builder.git" +# TODO: add mode 'local' +# 1.0.1 is the latest, may using commit sha later, in case thats possible *shrugs* +docker build -t jak891/docker-windows-builder:1.0.1 . \ No newline at end of file -- cgit v1.2.3-60-g2f50