Move to new xbps-[build|remote|local] helpers

eater/flavors/Dockerfile

@@ -1,2 +1,2 @@
 FROM d.xr.to/img
-RUN  xbps-install -Sy perl && xbps-remove -Oo && rm -rf /var/cache/xbps/* /tmp/xbps
+RUN  xbps-remote perl

grumble/Dockerfile

@@ -1,10 +1,10 @@
 FROM d.xr.to/xbps-builder AS builder
 COPY files/template /_workdir/srcpkgs/grumble/template
-RUN ./xbps-src pkg grumble
+RUN xbps-build grumble
 FROM d.xr.to/base:glibc AS main
 LABEL maintainer="=@eater.me"
 COPY --from=builder /_workdir/hostdir/binpkgs /tmp/xbps
-RUN xbps-install -yR /tmp/xbps grumble && xbps-remove -Oo && rm -rf /var/cache/xbps/* /tmp/xbps
+RUN xbps-local grumble
 RUN mkdir /grumble
 COPY files/grumble.ini /grumble/grumble.ini
 VOLUME /grumble

img/Dockerfile

@@ -4,4 +4,4 @@ RUN xbps-build img
 FROM d.xr.to/base:glibc AS main
 LABEL maintainer="=@eater.me"
 COPY --from=builder /_workdir/hostdir/binpkgs /tmp/xbps
-RUN xbps-install -yR /tmp/xbps img && xbps-remove -Oo && rm -rf /var/cache/xbps/* /tmp/xbps
+RUN xbps-local img

jre/Dockerfile

@@ -1,2 +1,2 @@
 FROM d.xr.to/base:glibc
-RUN xbps-install -Sy openjdk-jre && rm -rf /var/cache/xbps;
+RUN xbps-remote openjdk-jre;

nginx/Dockerfile

@@ -1,5 +1,5 @@
 FROM d.xr.to/base
-RUN xbps-install -Sy nginx
+RUN xbps-remote nginx
 RUN useradd -rU www -u 444
 RUN install -d -o www -g www /sites
 RUN chown -R www:www /var/tmp/nginx

php-fpm/Dockerfile

@@ -1,5 +1,5 @@
 FROM d.xr.to/php
-RUN xbps-install -Sy php-fpm
+RUN xbps-remote php-fpm
 RUN useradd -rU www -u 444
 RUN mkdir /var/log
 RUN sed -i 's:\(user\|group\)\s*=\s*http:\1 = www:;s:127\.0\.0\.1\:9000:9000:;s:\;error_log\s*=.+:error_log = /dev/stderr:;' /etc/php/php-fpm.conf /etc/php/php-fpm.d/www.conf

php/Dockerfile

@@ -1,6 +1,6 @@
 FROM d.xr.to/base
 LABEL maintainer="=@eater.me"
-RUN xbps-install -Sy php php-mysql php-sqlite wget
+RUN xbps-remote php php-mysql php-sqlite wget
 RUN sed 's:^open_basedir:;open_basedir:;s:;extension=\(bz2\|curl\|gettext\|gmp\|openssl\|pdo_mysql\|pdo_sqlite\):extension=\1:;s:;extension=xsl:;extension=xsl\nextension=zip\nextension=phar:' -i /etc/php/php.ini
 COPY composer-install.sh /bin/composer-install.sh
 RUN bash /bin/composer-install.sh

pleroma/Dockerfile

@@ -1,5 +1,5 @@
 FROM d.xr.to/base AS builder
-RUN xbps-install -Syu git gcc make libressl-devel elixir && mkdir /app
+RUN xbps-remote git gcc make libressl-devel elixir && mkdir /app
 ENV HOME=/app/pleroma
 ENV MIX_ENV=prod
 RUN git clone --depth 1 --branch v1.0.0 https://git.pleroma.social/pleroma/pleroma.git /app/pleroma

reg/Dockerfile

@@ -1,8 +1,8 @@
 FROM d.xr.to/xbps-builder AS builder
 COPY files/template /_workdir/srcpkgs/reg/template
-RUN ./xbps-src pkg reg
+RUN xbps-build reg
 FROM d.xr.to/base:glibc AS main
 LABEL maintainer="=@eater.me"
 COPY --from=builder /_workdir/hostdir/binpkgs /tmp/xbps
-RUN xbps-install -yR /tmp/xbps reg && xbps-remove -Oo && rm -rf /var/cache/xbps/* /tmp/xbps
+RUN xbps-local reg &&
 EXPOSE 8080/tcp

umurmur/Dockerfile

@@ -1,6 +1,6 @@
 FROM d.xr.to/base
 LABEL authors="krageon <krageon@gmail.com>"
-RUN xbps-install -Sy umurmur && xbps-remove -Oo
+RUN xbps-remote umurmur
 
 COPY files/umurmur.conf /etc/umurmur/umurmur.conf
 RUN chown -R umurmur:umurmur /etc/umurmur/

xbps-builder/README.md

@@ -12,13 +12,10 @@ it in a target docker container looks like the following
 
 ```Dockerfile
 FROM d.xr.to/xbps-builder AS builder
-RUN git pull
+RUN xbps-build docker
-RUN ./xbps-src pkg docker
 FROM d.xr.to/base
 COPY --from=builder /_workdir/hostdir /tmp/xbps
-RUN xbps-install -SyR /tmp/xbps docker \
+RUN xbps-local docker
-      && xbps-remove -Oo \
-      && rm -rf /var/cache/xbps/* /tmp/xbps
 ```
 
 # Warning