From a88b048498b4e85277b7c83e3b308c7aab8b9436 Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Tue, 23 Jul 2019 11:55:07 +0200
Subject: [PATCH] Move to new xbps-[build|remote|local] helpers

---
 eater/flavors/Dockerfile | 2 +-
 grumble/Dockerfile       | 4 ++--
 img/Dockerfile           | 2 +-
 jre/Dockerfile           | 2 +-
 nginx/Dockerfile         | 2 +-
 php-fpm/Dockerfile       | 2 +-
 php/Dockerfile           | 2 +-
 pleroma/Dockerfile       | 2 +-
 reg/Dockerfile           | 4 ++--
 umurmur/Dockerfile       | 2 +-
 xbps-builder/README.md   | 7 ++-----
 11 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/eater/flavors/Dockerfile b/eater/flavors/Dockerfile
index 267b989..1d21e05 100644
--- a/eater/flavors/Dockerfile
+++ b/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
diff --git a/grumble/Dockerfile b/grumble/Dockerfile
index 20fffe3..81ad455 100644
--- a/grumble/Dockerfile
+++ b/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
diff --git a/img/Dockerfile b/img/Dockerfile
index e2961ed..b935652 100644
--- a/img/Dockerfile
+++ b/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
diff --git a/jre/Dockerfile b/jre/Dockerfile
index e5a5596..373634b 100644
--- a/jre/Dockerfile
+++ b/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;
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index 960b3a5..b2b5553 100644
--- a/nginx/Dockerfile
+++ b/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
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 8549bd8..a9a21fa 100644
--- a/php-fpm/Dockerfile
+++ b/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
diff --git a/php/Dockerfile b/php/Dockerfile
index 9076571..5bb50dc 100644
--- a/php/Dockerfile
+++ b/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
diff --git a/pleroma/Dockerfile b/pleroma/Dockerfile
index 81d9670..9d655f2 100644
--- a/pleroma/Dockerfile
+++ b/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
diff --git a/reg/Dockerfile b/reg/Dockerfile
index ec992fe..2a084b2 100644
--- a/reg/Dockerfile
+++ b/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
diff --git a/umurmur/Dockerfile b/umurmur/Dockerfile
index 398b5e0..30406de 100644
--- a/umurmur/Dockerfile
+++ b/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/
diff --git a/xbps-builder/README.md b/xbps-builder/README.md
index b7d8198..7830e3b 100644
--- a/xbps-builder/README.md
+++ b/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-src pkg docker
+RUN xbps-build docker
 FROM d.xr.to/base
 COPY --from=builder /_workdir/hostdir /tmp/xbps
-RUN xbps-install -SyR /tmp/xbps docker \
-      && xbps-remove -Oo \
-      && rm -rf /var/cache/xbps/* /tmp/xbps
+RUN xbps-local docker
 ```
 
 # Warning