gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for 20.04 build

Browse Source
This commit is contained in:
benschermel 2022-02-14 17:33:05 -05:00
parent 9274d83fed
commit 0517daa308
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker-internal/.gitignore vendored
View File

@ -1 +0,0 @@
GHE_PersonalAccessToken.txt

3
docker-internal/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:20.04
SHELL ["/bin/bash","-c"] SHELL ["/bin/bash","-c"]
RUN groupadd -r keydb && useradd -r -g keydb keydb RUN groupadd -r keydb && useradd -r -g keydb keydb
# use gosu for easy step-down from root: https://github.com/tianon/gosu/releases # use gosu for easy step-down from root: https://github.com/tianon/gosu/releases
@ -62,6 +62,7 @@ RUN set -eux; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
find /usr/local -type f -executable -exec ldd '{}' ';' \ find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { print $(NF-1) }' \ | awk '/=>/ { print $(NF-1) }' \
| sed 's:.*/::' \
| sort -u \ | sort -u \
| xargs -r dpkg-query --search \ | xargs -r dpkg-query --search \
| cut -d: -f1 \ | cut -d: -f1 \

3
docker-internal/docker_PAT_build/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:20.04
SHELL ["/bin/bash","-c"] SHELL ["/bin/bash","-c"]
RUN groupadd -r keydb && useradd -r -g keydb keydb RUN groupadd -r keydb && useradd -r -g keydb keydb
# use gosu for easy step-down from root: https://github.com/tianon/gosu/releases # use gosu for easy step-down from root: https://github.com/tianon/gosu/releases
@ -64,6 +64,7 @@ RUN --mount=type=secret,id=PAT export $(cat /run/secrets/PAT | xargs); \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
find /usr/local -type f -executable -exec ldd '{}' ';' \ find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { print $(NF-1) }' \ | awk '/=>/ { print $(NF-1) }' \
| sed 's:.*/::' \
| sort -u \ | sort -u \
| xargs -r dpkg-query --search \ | xargs -r dpkg-query --search \
| cut -d: -f1 \ | cut -d: -f1 \

2
docker-internal/docker_PAT_build/GHE_PersonalAccessToken.txt Normal file
View File

@ -0,0 +1,2 @@
PAT_ID=
TOKEN=