summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzimbatm2019-05-01 10:22:47 +0200
committerzimbatm2019-05-01 10:29:22 +0200
commit62b5109a158461845cf23b1772779bb5c870dd49 (patch)
tree0adc97317e3f6f412d3cd565f2fbf7743f51329d
parenta325962cbbf00e147f78e07b6a4c697d9a17b352 (diff)
downloadaur-62b5109a158461845cf23b1772779bb5c870dd49.tar.gz
build: use the official archlinux/base image
pkgbuild-introspection now seems to be part of AUR so use another method to generate the .SRCINFO
-rw-r--r--Dockerfile6
-rw-r--r--README.md4
-rwxr-xr-xdocker-mksrcinfo2
3 files changed, 7 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile
index 95601922222..b5cf5d19815 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,7 @@
-FROM pritunl/archlinux:latest
-RUN pacman -S --noconfirm --needed base-devel pkgbuild-introspection
+FROM archlinux/base:latest
+
+RUN pacman -Sy --noconfirm --needed base-devel
RUN mkdir /src
+
WORKDIR /src
diff --git a/README.md b/README.md
index e98a2fea058..e46c5377da2 100644
--- a/README.md
+++ b/README.md
@@ -23,9 +23,9 @@ vagrant up
vagrant ssh
# Install dev dependencies
sudo pacman -Syu
-sudo pacman -S --needed base-devel pkgbuild-introspection
+sudo pacman -S --needed base-devel
cd /vagrant
-mksrcinfo
+makepkg --printsrcinfo > .SRCINFO
```
## Push to multiple origins
diff --git a/docker-mksrcinfo b/docker-mksrcinfo
index 23a340d2729..38ff323def6 100755
--- a/docker-mksrcinfo
+++ b/docker-mksrcinfo
@@ -5,4 +5,4 @@
#
id=$(docker build -q .)
-docker run -ti --rm --volume "$(pwd):/src" "$id" /usr/sbin/mksrcinfo
+docker run -ti --rm --volume "$(pwd):/src" --user="$(id -u):$(id -g)" "$id" makepkg --printsrcinfo > .SRCINFO