diff --git a/Dockerfile.builder b/Dockerfile.builder index ec56b28..30158d9 100644 --- a/Dockerfile.builder +++ b/Dockerfile.builder @@ -1,16 +1,15 @@ -FROM rosalab/rosa2016.1 +FROM docker.io/rosalab/rosa2016.1 RUN rm -rfv /var/lib/rpm \ && urpmi.removemedia -a \ - && urpmi.addmedia main_release http://abf-downloads.rosalinux.ru/rosa2016.1/repository/x86_64/main/release/ \ - && urpmi.addmedia main_updates http://abf-downloads.rosalinux.ru/rosa2016.1/repository/x86_64/main/updates \ - && urpmi.addmedia main_testing http://abf-downloads.rosalinux.ru/rosa2016.1/repository/x86_64/main/testing \ - && urpmi.addmedia corp_test_personal http://abf-downloads.rosalinux.ru/corp_test_personal/repository/rosa2016.1/x86_64/main/release + && urpmi.addmedia main_release https://mirror.yandex.ru/rosa/rosa2016.1/repository/x86_64/main/release \ + && urpmi.addmedia main_updates https://mirror.yandex.ru/rosa/rosa2016.1/repository/x86_64/main/updates \ + && urpmi.addmedia djam_personal https://abf-downloads.rosalinux.ru/djam_personal/repository/rosa2016.1/x86_64/main/release \ && urpmi --auto --auto-update --no-verify-rpm \ && rm -f /etc/localtime \ && ln -s /usr/share/zoneinfo/UTC /etc/localtime \ && urpmi --no-suggests --no-verify-rpm --auto mock-urpm git curl sudo builder-c xz timezone \ - && sed -i 's!openmandriva.org!rosalinux.ru!g' /etc/builder-c/filestore_upload.sh \ +# && sed -i 's!openmandriva.org!rosalinux.ru!g' /etc/builder-c/filestore_upload.sh \ && sed -i -e "s/Defaults requiretty.*/ #Defaults requiretty/g" /etc/sudoers \ && groupadd mock \ && echo "%mock ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \ diff --git a/README.md b/README.md index 0ca0a3c..d8cbc2c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Clone repository ```bash -git clone https://github.com/OpenMandrivaSoftware/rosa-builder.git +git clone https://tvoygit.ru/Djam/r11-builder-agent.git ``` Create builder image: @@ -22,7 +22,7 @@ docker rm -v $(docker ps -a -q -f status=exited) ## Run abf builder ```bash -docker run -ti --rm --privileged=true -h .openmandriva.org -e BUILD_TOKEN="your_token" \ +docker run -ti --rm --privileged=true -h .r11.org.ru -e BUILD_TOKEN="your_token" \ -e BUILD_ARCH="x86_64 armv7hl i586 i686 aarch64" \ -e BUILD_PLATFORM="cooker" openmandriva/builder ``` diff --git a/builder.conf b/builder.conf index 9354e99..f83e3ae 100644 --- a/builder.conf +++ b/builder.conf @@ -7,7 +7,7 @@ application: platforms:{ list=["mdv"]; mdv:{ - git="https://github.com/OpenMandrivaSoftware/rosa-builder.git"; + git="https://tvoygit.ru/Djam/r11-builder-agent.git"; branch="master"; }; }; diff --git a/docker-brew-rosa/rosa2016.1/.Dockerfile.un~ b/docker-brew-rosa/rosa2016.1/.Dockerfile.un~ deleted file mode 100644 index e585c36..0000000 Binary files a/docker-brew-rosa/rosa2016.1/.Dockerfile.un~ and /dev/null differ diff --git a/docker-brew-rosa/rosa2019.1/.Dockerfile.un~ b/docker-brew-rosa/rosa2019.1/.Dockerfile.un~ deleted file mode 100644 index e585c36..0000000 Binary files a/docker-brew-rosa/rosa2019.1/.Dockerfile.un~ and /dev/null differ