Browse Source

Update pikaur image

master
blallo 10 months ago
parent
commit
ba8f1f1ae3
Signed by: blallo GPG Key ID: 0CBE577C9B72DC3F
  1. 18
      .drone.yml
  2. 10
      Dockerfile

18
.drone.yml

@ -13,7 +13,7 @@ workspace:
steps:
- name: cache-init_electron-ozone
pull: if-not-exists
image: leophys/pikaur:0.2
image: leophys/pikaur:0.3
user: root
commands:
- |
@ -36,7 +36,7 @@ steps:
cp -r /usr/. /cache_stage/usr/
getfacl -p -R /usr > /cache_stage/usr/permissions.acl
fi
- chmod a+rw /output
- chown build:33 -R /output
volumes:
- name: etc_electron-ozone
path: /cache_stage/etc
@ -51,7 +51,7 @@ steps:
- name: cache-acl_electron-ozone
pull: if-not-exists
image: leophys/pikaur:0.2
image: leophys/pikaur:0.3
user: root
commands:
- setfacl --restore=/etc/permissions.acl
@ -72,7 +72,7 @@ steps:
- name: build_electron-ozone
pull: if-not-exists
image: leophys/pikaur:0.2
image: leophys/pikaur:0.3
commands:
- |
if [ -f /output/lock ]; then
@ -186,7 +186,7 @@ workspace:
steps:
- name: cache-init_discord_arch_electron
pull: if-not-exists
image: leophys/pikaur:0.2
image: leophys/pikaur:0.3
user: root
commands:
- |
@ -209,7 +209,7 @@ steps:
cp -r /usr/. /cache_stage/usr/
getfacl -p -R /usr > /cache_stage/usr/permissions.acl
fi
- chmod a+rw /output
- chown -R build:33 /output
volumes:
- name: etc_discord_arch_electron
path: /cache_stage/etc
@ -224,7 +224,7 @@ steps:
- name: cache-acl_discord_arch_electron
pull: if-not-exists
image: leophys/pikaur:0.2
image: leophys/pikaur:0.3
user: root
commands:
- setfacl --restore=/etc/permissions.acl
@ -246,7 +246,7 @@ steps:
- name: build_discord_arch_electron
pull: if-not-exists
image: leophys/pikaur:0.2
image: leophys/pikaur:0.3
commands:
- |
if [ -f /output/lock ]; then
@ -381,6 +381,6 @@ depends_on:
---
kind: signature
hmac: ee49a15eb797f2ad05e9289dacfc7f2ed34488cb2fc79bd4f5af416d489c5fa3
hmac: 6a46d65e99fe32d2c18292beb7ddc3f278cc3cf68013d3ce5821fc248a9befdb
...

10
Dockerfile

@ -4,8 +4,8 @@ ARG uid=1000
ARG gid=33
RUN CHECK_GROUP=$(cat /etc/group|awk -F: '{print $3}'|egrep "^${gid}$"|wc -l) \
&& if [ $CHECK_GROUP -eq 0 ]; then groupadd -g ${gid} doer; fi \
&& useradd -u ${uid} -g ${gid} -m -d /doer doer \
&& if [ $CHECK_GROUP -eq 0 ]; then groupadd -g ${gid} build; fi \
&& useradd -u ${uid} -g ${gid} -m -d /build build \
&& pacman -Sy --noconfirm \
base-devel \
glibc \
@ -14,11 +14,11 @@ RUN CHECK_GROUP=$(cat /etc/group|awk -F: '{print $3}'|egrep "^${gid}$"|wc -l) \
python-commonmark \
pyalpm \
&& chmod 600 /etc/sudoers \
&& sed -i"" '/root ALL.*/a doer ALL=(ALL) NOPASSWD:ALL' /etc/sudoers \
&& sed -i"" '/root ALL.*/a build ALL=(ALL) NOPASSWD:ALL' /etc/sudoers \
&& chmod 440 /etc/sudoers
USER doer
WORKDIR /doer
USER build
WORKDIR /build
RUN git clone https://aur.archlinux.org/pikaur.git \
&& cd pikaur \

Loading…
Cancel
Save