api,repo: Switch to debian base image

This commit is contained in:
Thomas Hobson 2021-02-28 01:15:52 +13:00
parent b91ff42bb8
commit 12dc93435d
No known key found for this signature in database
GPG Key ID: 9F1FD9D87950DB6F
2 changed files with 10 additions and 7 deletions

View File

@ -1,7 +1,9 @@
FROM node:15.8.0-alpine3.13 FROM node:15.8.0-buster-slim
RUN apk add --no-cache gnupg tar bash coreutils shadow util-linux RUN dpkg-reconfigure -p critical dash
RUN userdel -r node RUN apt-get update && apt-get install -y gnupg tar coreutils util-linux \
RUN for i in $(seq 1000 1500); do \ && rm -rf /var/lib/apt/lists/*
RUN for i in $(seq 1001 1500); do \
groupadd -g $i runner$i && \ groupadd -g $i runner$i && \
useradd -M runner$i -g $i -u $i ; \ useradd -M runner$i -g $i -u $i ; \
done done

View File

@ -1,7 +1,8 @@
FROM alpine:3.13 FROM debian:buster-slim
RUN apk add --no-cache python3 py3-pip gnupg jq zlib zlib-dev cmake cmake-doc extra-cmake-modules extra-cmake-modules-doc build-base gcc abuild binutils binutils-doc gcc-doc yq bash coreutils util-linux pciutils usbutils coreutils binutils findutils grep && \ RUN apt-get update && apt-get install -y bc curl git linux-headers-amd64 perl xz-utils python3 python3-pip gnupg jq zlib1g-dev cmake cmake-doc extra-cmake-modules build-essential gcc binutils bash coreutils util-linux pciutils usbutils coreutils binutils findutils grep && \
ln -sf /bin/bash /bin/sh && \ ln -sf /bin/bash /bin/sh && \
pip3 install 'yq==2.12.0' pip3 install 'yq==2.12.0' && \
rm -rf /var/lib/apt/lists/*
CMD [ "bash", "/repo/make.sh" ] CMD [ "bash", "/repo/make.sh" ]