This commit is contained in:
parent
99dfe3c5bb
commit
ba8f1f1ae3
18
.drone.yml
18
.drone.yml
|
@ -13,7 +13,7 @@ workspace:
|
||||||
steps:
|
steps:
|
||||||
- name: cache-init_electron-ozone
|
- name: cache-init_electron-ozone
|
||||||
pull: if-not-exists
|
pull: if-not-exists
|
||||||
image: leophys/pikaur:0.2
|
image: leophys/pikaur:0.3
|
||||||
user: root
|
user: root
|
||||||
commands:
|
commands:
|
||||||
- |
|
- |
|
||||||
|
@ -36,7 +36,7 @@ steps:
|
||||||
cp -r /usr/. /cache_stage/usr/
|
cp -r /usr/. /cache_stage/usr/
|
||||||
getfacl -p -R /usr > /cache_stage/usr/permissions.acl
|
getfacl -p -R /usr > /cache_stage/usr/permissions.acl
|
||||||
fi
|
fi
|
||||||
- chmod a+rw /output
|
- chown build:33 -R /output
|
||||||
volumes:
|
volumes:
|
||||||
- name: etc_electron-ozone
|
- name: etc_electron-ozone
|
||||||
path: /cache_stage/etc
|
path: /cache_stage/etc
|
||||||
|
@ -51,7 +51,7 @@ steps:
|
||||||
|
|
||||||
- name: cache-acl_electron-ozone
|
- name: cache-acl_electron-ozone
|
||||||
pull: if-not-exists
|
pull: if-not-exists
|
||||||
image: leophys/pikaur:0.2
|
image: leophys/pikaur:0.3
|
||||||
user: root
|
user: root
|
||||||
commands:
|
commands:
|
||||||
- setfacl --restore=/etc/permissions.acl
|
- setfacl --restore=/etc/permissions.acl
|
||||||
|
@ -72,7 +72,7 @@ steps:
|
||||||
|
|
||||||
- name: build_electron-ozone
|
- name: build_electron-ozone
|
||||||
pull: if-not-exists
|
pull: if-not-exists
|
||||||
image: leophys/pikaur:0.2
|
image: leophys/pikaur:0.3
|
||||||
commands:
|
commands:
|
||||||
- |
|
- |
|
||||||
if [ -f /output/lock ]; then
|
if [ -f /output/lock ]; then
|
||||||
|
@ -186,7 +186,7 @@ workspace:
|
||||||
steps:
|
steps:
|
||||||
- name: cache-init_discord_arch_electron
|
- name: cache-init_discord_arch_electron
|
||||||
pull: if-not-exists
|
pull: if-not-exists
|
||||||
image: leophys/pikaur:0.2
|
image: leophys/pikaur:0.3
|
||||||
user: root
|
user: root
|
||||||
commands:
|
commands:
|
||||||
- |
|
- |
|
||||||
|
@ -209,7 +209,7 @@ steps:
|
||||||
cp -r /usr/. /cache_stage/usr/
|
cp -r /usr/. /cache_stage/usr/
|
||||||
getfacl -p -R /usr > /cache_stage/usr/permissions.acl
|
getfacl -p -R /usr > /cache_stage/usr/permissions.acl
|
||||||
fi
|
fi
|
||||||
- chmod a+rw /output
|
- chown -R build:33 /output
|
||||||
volumes:
|
volumes:
|
||||||
- name: etc_discord_arch_electron
|
- name: etc_discord_arch_electron
|
||||||
path: /cache_stage/etc
|
path: /cache_stage/etc
|
||||||
|
@ -224,7 +224,7 @@ steps:
|
||||||
|
|
||||||
- name: cache-acl_discord_arch_electron
|
- name: cache-acl_discord_arch_electron
|
||||||
pull: if-not-exists
|
pull: if-not-exists
|
||||||
image: leophys/pikaur:0.2
|
image: leophys/pikaur:0.3
|
||||||
user: root
|
user: root
|
||||||
commands:
|
commands:
|
||||||
- setfacl --restore=/etc/permissions.acl
|
- setfacl --restore=/etc/permissions.acl
|
||||||
|
@ -246,7 +246,7 @@ steps:
|
||||||
|
|
||||||
- name: build_discord_arch_electron
|
- name: build_discord_arch_electron
|
||||||
pull: if-not-exists
|
pull: if-not-exists
|
||||||
image: leophys/pikaur:0.2
|
image: leophys/pikaur:0.3
|
||||||
commands:
|
commands:
|
||||||
- |
|
- |
|
||||||
if [ -f /output/lock ]; then
|
if [ -f /output/lock ]; then
|
||||||
|
@ -381,6 +381,6 @@ depends_on:
|
||||||
|
|
||||||
---
|
---
|
||||||
kind: signature
|
kind: signature
|
||||||
hmac: ee49a15eb797f2ad05e9289dacfc7f2ed34488cb2fc79bd4f5af416d489c5fa3
|
hmac: 6a46d65e99fe32d2c18292beb7ddc3f278cc3cf68013d3ce5821fc248a9befdb
|
||||||
|
|
||||||
...
|
...
|
||||||
|
|
10
Dockerfile
10
Dockerfile
|
@ -4,8 +4,8 @@ ARG uid=1000
|
||||||
ARG gid=33
|
ARG gid=33
|
||||||
|
|
||||||
RUN CHECK_GROUP=$(cat /etc/group|awk -F: '{print $3}'|egrep "^${gid}$"|wc -l) \
|
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 \
|
&& if [ $CHECK_GROUP -eq 0 ]; then groupadd -g ${gid} build; fi \
|
||||||
&& useradd -u ${uid} -g ${gid} -m -d /doer doer \
|
&& useradd -u ${uid} -g ${gid} -m -d /build build \
|
||||||
&& pacman -Sy --noconfirm \
|
&& pacman -Sy --noconfirm \
|
||||||
base-devel \
|
base-devel \
|
||||||
glibc \
|
glibc \
|
||||||
|
@ -14,11 +14,11 @@ RUN CHECK_GROUP=$(cat /etc/group|awk -F: '{print $3}'|egrep "^${gid}$"|wc -l) \
|
||||||
python-commonmark \
|
python-commonmark \
|
||||||
pyalpm \
|
pyalpm \
|
||||||
&& chmod 600 /etc/sudoers \
|
&& 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
|
&& chmod 440 /etc/sudoers
|
||||||
|
|
||||||
USER doer
|
USER build
|
||||||
WORKDIR /doer
|
WORKDIR /build
|
||||||
|
|
||||||
RUN git clone https://aur.archlinux.org/pikaur.git \
|
RUN git clone https://aur.archlinux.org/pikaur.git \
|
||||||
&& cd pikaur \
|
&& cd pikaur \
|
||||||
|
|
Loading…
Reference in New Issue
Block a user