mirror of
https://github.com/jessfraz/dockerfiles.git
synced 2024-11-23 03:21:28 +01:00
fix dockerfile builds
Signed-off-by: Jess Frazelle <acidburn@jessfraz.com>
This commit is contained in:
parent
a6a529eda0
commit
ffc0508b44
|
@ -6,7 +6,7 @@
|
||||||
# -v /etc/localtime:/etc/localtime:ro \
|
# -v /etc/localtime:/etc/localtime:ro \
|
||||||
# r.j3ss.co/bcc-tools
|
# r.j3ss.co/bcc-tools
|
||||||
#
|
#
|
||||||
FROM debian:buster-slim
|
FROM debian:stretch-slim
|
||||||
MAINTAINER Jessica Frazelle <jess@linux.com>
|
MAINTAINER Jessica Frazelle <jess@linux.com>
|
||||||
|
|
||||||
ENV PATH /usr/share/bcc/tools:$PATH
|
ENV PATH /usr/share/bcc/tools:$PATH
|
||||||
|
|
|
@ -3,13 +3,15 @@ RUN apk add --no-cache \
|
||||||
git
|
git
|
||||||
RUN git clone https://github.com/brendandburns/cl-k8s.git /cl-k8s
|
RUN git clone https://github.com/brendandburns/cl-k8s.git /cl-k8s
|
||||||
|
|
||||||
FROM alpine:latest
|
FROM debian:buster-slim
|
||||||
LABEL maintainer "Jessie Frazelle <jess@linux.com>"
|
LABEL maintainer "Jessie Frazelle <jess@linux.com>"
|
||||||
|
|
||||||
RUN apk --no-cache add \
|
RUN apt-get update && apt-get install -y \
|
||||||
--repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ \
|
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
clisp
|
clisp \
|
||||||
|
wget \
|
||||||
|
--no-install-recommends \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
COPY .clisprc.lisp /home/user/.clisprc.lisp
|
COPY .clisprc.lisp /home/user/.clisprc.lisp
|
||||||
COPY --from=cl-k8s /cl-k8s /home/user/quicklisp/local-projects/cl-k8s
|
COPY --from=cl-k8s /cl-k8s /home/user/quicklisp/local-projects/cl-k8s
|
||||||
|
@ -18,7 +20,7 @@ COPY --from=cl-k8s /cl-k8s /home/user/quicklisp/local-projects/cl-k8s
|
||||||
RUN wget -O /home/user/quicklisp.lisp https://beta.quicklisp.org/quicklisp.lisp
|
RUN wget -O /home/user/quicklisp.lisp https://beta.quicklisp.org/quicklisp.lisp
|
||||||
|
|
||||||
ENV HOME /home/user
|
ENV HOME /home/user
|
||||||
RUN adduser -u 1001 -D user \
|
RUN useradd --create-home --home-dir $HOME user \
|
||||||
&& chown -R user:user $HOME
|
&& chown -R user:user $HOME
|
||||||
|
|
||||||
USER user
|
USER user
|
||||||
|
|
|
@ -82,10 +82,6 @@ WORKDIR /usr/src/lkp-tests
|
||||||
RUN make install \
|
RUN make install \
|
||||||
&& lkp install
|
&& lkp install
|
||||||
|
|
||||||
# Create the lkp user and group
|
|
||||||
RUN groupadd --gid 1090 lkp
|
|
||||||
RUN useradd --uid 1090 --gid 1090 lkp
|
|
||||||
|
|
||||||
COPY runbench /usr/local/bin/runbench
|
COPY runbench /usr/local/bin/runbench
|
||||||
|
|
||||||
CMD [ "lkp" ]
|
CMD [ "lkp" ]
|
||||||
|
|
|
@ -32,8 +32,8 @@ RUN useradd --create-home --home-dir $HOME user \
|
||||||
|
|
||||||
ENV LANG C.UTF-8
|
ENV LANG C.UTF-8
|
||||||
|
|
||||||
# https://www.torproject.org/projects/torbrowser.html.en
|
# https://www.torproject.org/download/alpha/
|
||||||
ENV TOR_VERSION 8.5a8
|
ENV TOR_VERSION 9.0a1
|
||||||
ENV TOR_FINGERPRINT 0x4E2C6E8793298290
|
ENV TOR_FINGERPRINT 0x4E2C6E8793298290
|
||||||
|
|
||||||
# download tor and check signature
|
# download tor and check signature
|
||||||
|
|
|
@ -14,7 +14,7 @@ RUN git clone --depth 1 --branch ${TRANSFER_SH_VERSION} https://github.com/dutch
|
||||||
|
|
||||||
WORKDIR /go/src/github.com/dutchcoders/transfer.sh
|
WORKDIR /go/src/github.com/dutchcoders/transfer.sh
|
||||||
|
|
||||||
RUN go build -o /usr/bin/transfer.sh
|
RUN GO111MODULE=on go build -o /usr/bin/transfer.sh
|
||||||
|
|
||||||
# Create a clean image without build dependencies
|
# Create a clean image without build dependencies
|
||||||
FROM alpine:latest
|
FROM alpine:latest
|
||||||
|
|
|
@ -18,7 +18,6 @@ RUN apt-get update && apt-get install -y \
|
||||||
desktop-file-utils \
|
desktop-file-utils \
|
||||||
ibus \
|
ibus \
|
||||||
ibus-gtk \
|
ibus-gtk \
|
||||||
ibus-qt4 \
|
|
||||||
lib32z1 \
|
lib32z1 \
|
||||||
libx11-6 \
|
libx11-6 \
|
||||||
libasound2-dev \
|
libasound2-dev \
|
||||||
|
@ -42,7 +41,6 @@ RUN apt-get update && apt-get install -y \
|
||||||
libxcb-image0 \
|
libxcb-image0 \
|
||||||
libxcb-keysyms1 \
|
libxcb-keysyms1 \
|
||||||
libxcb-xtest0 \
|
libxcb-xtest0 \
|
||||||
libibus-qt1 \
|
|
||||||
libnss3 \
|
libnss3 \
|
||||||
libxss1 \
|
libxss1 \
|
||||||
sudo \
|
sudo \
|
||||||
|
|
|
@ -5,9 +5,9 @@ COPY ./.zshrc /root/.zshrc
|
||||||
RUN apk --no-cache add \
|
RUN apk --no-cache add \
|
||||||
shadow \
|
shadow \
|
||||||
zsh \
|
zsh \
|
||||||
&& chsh -s /bin/zsh
|
&& chsh -s /bin/zsh || true
|
||||||
|
|
||||||
ENV SHELL /usr/bin/zsh
|
ENV SHELL /usr/bin/zsh
|
||||||
|
|
||||||
WORKDIR /root
|
WORKDIR /root
|
||||||
ENTRYPOINT /bin/zsh
|
ENTRYPOINT ["/bin/zsh"]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user