mirror of
https://github.com/jessfraz/dockerfiles.git
synced 2025-02-17 09:37:49 +01:00
fixes
Signed-off-by: Jess Frazelle <me@jessfraz.com>
This commit is contained in:
parent
23b8c747a8
commit
39e618c3cb
|
@ -4,6 +4,7 @@ MAINTAINER Jessie Frazelle <jess@linux.com>
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
|
gnupg \
|
||||||
--no-install-recommends
|
--no-install-recommends
|
||||||
|
|
||||||
RUN export GNUPGHOME="$(mktemp -d)" \
|
RUN export GNUPGHOME="$(mktemp -d)" \
|
||||||
|
|
|
@ -1,10 +1,13 @@
|
||||||
FROM ruby:alpine
|
FROM ruby:alpine
|
||||||
MAINTAINER Jessie Frazelle <jess@linux.com>
|
MAINTAINER Jessie Frazelle <jess@linux.com>
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apk add --no-cache \
|
||||||
libcurl3-dev \
|
libcurl
|
||||||
--no-install-recommends \
|
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
|
||||||
&& gem install cloudapp
|
|
||||||
|
|
||||||
ENTRYPOINT ["cloudapp"]
|
RUN set -x \
|
||||||
|
&& apk add --no-cache --virtual .build-deps \
|
||||||
|
build-base \
|
||||||
|
&& gem install cloudapp --no-rdoc --no-ri \
|
||||||
|
&& apk del .build-deps
|
||||||
|
|
||||||
|
ENTRYPOINT ["cloudapp"]
|
||||||
|
|
|
@ -19,7 +19,7 @@ RUN set -x \
|
||||||
&& apk add --no-cache --virtual .build-deps \
|
&& apk add --no-cache --virtual .build-deps \
|
||||||
autoconf \
|
autoconf \
|
||||||
automake \
|
automake \
|
||||||
ca-certificates \
|
curl \
|
||||||
gcc \
|
gcc \
|
||||||
glib-dev \
|
glib-dev \
|
||||||
gnupg \
|
gnupg \
|
||||||
|
@ -35,8 +35,8 @@ RUN set -x \
|
||||||
pkgconf \
|
pkgconf \
|
||||||
tar \
|
tar \
|
||||||
xz \
|
xz \
|
||||||
&& wget "https://github.com/irssi/irssi/releases/download/${IRSSI_VERSION}/irssi-${IRSSI_VERSION}.tar.xz" -O /tmp/irssi.tar.xz \
|
&& curl -sSL "https://github.com/irssi/irssi/releases/download/${IRSSI_VERSION}/irssi-${IRSSI_VERSION}.tar.xz" -o /tmp/irssi.tar.xz \
|
||||||
&& wget "https://github.com/irssi/irssi/releases/download/${IRSSI_VERSION}/irssi-${IRSSI_VERSION}.tar.xz.asc" -O /tmp/irssi.tar.xz.asc \
|
&& curl -sSL "https://github.com/irssi/irssi/releases/download/${IRSSI_VERSION}/irssi-${IRSSI_VERSION}.tar.xz.asc" -o /tmp/irssi.tar.xz.asc \
|
||||||
&& export GNUPGHOME="$(mktemp -d)" \
|
&& export GNUPGHOME="$(mktemp -d)" \
|
||||||
# gpg: key DDBEF0E1: public key "The Irssi project <staff@irssi.org>" imported
|
# gpg: key DDBEF0E1: public key "The Irssi project <staff@irssi.org>" imported
|
||||||
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1 \
|
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1 \
|
||||||
|
@ -56,8 +56,8 @@ RUN set -x \
|
||||||
&& make -j$(getconf _NPROCESSORS_ONLN) \
|
&& make -j$(getconf _NPROCESSORS_ONLN) \
|
||||||
&& make install \
|
&& make install \
|
||||||
) \
|
) \
|
||||||
&& wget "https://otr.cypherpunks.ca/libotr-${LIB_OTR_VERSION}.tar.gz" -O /tmp/libotr.tar.gz \
|
&& curl -sSL "https://otr.cypherpunks.ca/libotr-${LIB_OTR_VERSION}.tar.gz" -o /tmp/libotr.tar.gz \
|
||||||
&& wget "https://otr.cypherpunks.ca/libotr-${LIB_OTR_VERSION}.tar.gz.asc" -O /tmp/libotr.tar.gz.asc \
|
&& curl -sSL "https://otr.cypherpunks.ca/libotr-${LIB_OTR_VERSION}.tar.gz.asc" -o /tmp/libotr.tar.gz.asc \
|
||||||
&& export GNUPGHOME="$(mktemp -d)" \
|
&& export GNUPGHOME="$(mktemp -d)" \
|
||||||
# gpg: key 42C2ABAD: public key "OTR Dev Team (Signing Key) <otr@cypherpunks.ca>" imported
|
# gpg: key 42C2ABAD: public key "OTR Dev Team (Signing Key) <otr@cypherpunks.ca>" imported
|
||||||
&& gpg --keyserver pgp.mit.edu --recv-keys 22DF3305DF56667CE15784FCF24DE08F42C2ABAD \
|
&& gpg --keyserver pgp.mit.edu --recv-keys 22DF3305DF56667CE15784FCF24DE08F42C2ABAD \
|
||||||
|
@ -75,13 +75,13 @@ RUN set -x \
|
||||||
&& make install \
|
&& make install \
|
||||||
) \
|
) \
|
||||||
&& mkdir -p /usr/src/irssi-otr \
|
&& mkdir -p /usr/src/irssi-otr \
|
||||||
&& wget "https://github.com/cryptodotis/irssi-otr/archive/v${IRSSI_OTR_VERSION}.tar.gz" -O /tmp/irssi-otr.tar.gz \
|
&& curl -sSL "https://github.com/cryptodotis/irssi-otr/archive/v${IRSSI_OTR_VERSION}.tar.gz" -o /tmp/irssi-otr.tar.gz \
|
||||||
&& mkdir -p /usr/src/irssi-otr \
|
&& mkdir -p /usr/src/irssi-otr \
|
||||||
&& tar -xf /tmp/irssi-otr.tar.gz -C /usr/src/irssi-otr --strip-components 1 \
|
&& tar -xf /tmp/irssi-otr.tar.gz -C /usr/src/irssi-otr --strip-components 1 \
|
||||||
&& rm /tmp/irssi-otr.tar.gz \
|
&& rm /tmp/irssi-otr.tar.gz \
|
||||||
&& ( \
|
&& ( \
|
||||||
cd /usr/src/irssi-otr \
|
cd /usr/src/irssi-otr \
|
||||||
&& wget "$PATCH_FOR_IRSSI_OTR" -O patch.diff \
|
&& curl -sSL "$PATCH_FOR_IRSSI_OTR" -o patch.diff \
|
||||||
&& patch -p1 < patch.diff \
|
&& patch -p1 < patch.diff \
|
||||||
&& ./bootstrap \
|
&& ./bootstrap \
|
||||||
&& ./configure \
|
&& ./configure \
|
||||||
|
|
|
@ -10,10 +10,6 @@ RUN apt-get update && apt-get install -y \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
ENV LANG en_US.UTF-8
|
ENV LANG en_US.UTF-8
|
||||||
ENV HOME /home/mitm
|
|
||||||
RUN useradd --create-home --home-dir $HOME mitm \
|
|
||||||
&& chown -R mitm:mitm $HOME
|
|
||||||
|
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
|
||||||
RUN buildDeps=' \
|
RUN buildDeps=' \
|
||||||
|
@ -24,14 +20,19 @@ RUN buildDeps=' \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
libxslt1-dev \
|
libxslt1-dev \
|
||||||
python-dev \
|
python-dev \
|
||||||
|
python-setuptools \
|
||||||
zlib1g-dev \
|
zlib1g-dev \
|
||||||
' \
|
' \
|
||||||
&& set -x \
|
&& set -x \
|
||||||
&& apt-get update && apt-get install -y ${buildDeps} --no-install-recommends \
|
&& apt-get update && apt-get install -y ${buildDeps} --no-install-recommends \
|
||||||
&& pip install mitmproxy \
|
&& pip install setuptools mitmproxy \
|
||||||
&& apt-get purge -y --auto-remove ${buildDeps} \
|
&& apt-get purge -y --auto-remove ${buildDeps} \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
ENV HOME /home/mitm
|
||||||
|
RUN useradd --create-home --home-dir $HOME mitm \
|
||||||
|
&& chown -R mitm:mitm $HOME
|
||||||
|
|
||||||
USER mitm
|
USER mitm
|
||||||
|
|
||||||
ENTRYPOINT [ "mitmproxy" ]
|
ENTRYPOINT [ "mitmproxy" ]
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
FROM python:2-alpine
|
FROM python:3-alpine
|
||||||
MAINTAINER Justin Garrison <justinleegarrison@gmail.com>
|
MAINTAINER Justin Garrison <justinleegarrison@gmail.com>
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apk add --no-cache \
|
||||||
mplayer mpv \
|
mplayer \
|
||||||
--no-install-recommends \
|
mpv
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
RUN pip install mps-youtube
|
RUN pip install mps-youtube
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
# Base docker image
|
# Base docker image
|
||||||
FROM debian:stretch
|
FROM debian:jessie
|
||||||
MAINTAINER Jessie Frazelle <jess@linux.com>
|
MAINTAINER Jessie Frazelle <jess@linux.com>
|
||||||
|
|
||||||
ADD https://download1.rstudio.org/rstudio-0.99.484-amd64.deb /src/rstudio.deb
|
ADD https://download1.rstudio.org/rstudio-0.99.484-amd64.deb /src/rstudio.deb
|
||||||
|
|
21
t/Dockerfile
21
t/Dockerfile
|
@ -1,16 +1,13 @@
|
||||||
FROM ruby:alpine
|
FROM ruby:alpine
|
||||||
MAINTAINER Jessie Frazelle <jess@linux.com>
|
MAINTAINER Jessie Frazelle <jess@linux.com>
|
||||||
|
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
ca-certificates
|
ca-certificates
|
||||||
|
|
||||||
RUN set -x \
|
RUN set -x \
|
||||||
&& apk add --no-cache --virtual .build-deps \
|
&& apk add --no-cache --virtual .build-deps \
|
||||||
build-base \
|
build-base \
|
||||||
&& gem install \
|
&& gem install io-console t --no-rdoc --no-ri \
|
||||||
io-console \
|
&& apk del .build-deps
|
||||||
t \
|
|
||||||
--no-rdoc --no-ri \
|
|
||||||
&& apk del .build-deps
|
|
||||||
|
|
||||||
ENTRYPOINT [ "t" ]
|
ENTRYPOINT ["t"]
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ubuntu:16.04
|
FROM ubuntu:14.04
|
||||||
MAINTAINER Jessie Frazelle <jess@linux.com>
|
MAINTAINER Jessie Frazelle <jess@linux.com>
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
|
|
|
@ -49,20 +49,21 @@ ENV HOME /home/user
|
||||||
RUN useradd --create-home --home-dir $HOME user \
|
RUN useradd --create-home --home-dir $HOME user \
|
||||||
&& chown -R user:user $HOME
|
&& chown -R user:user $HOME
|
||||||
|
|
||||||
|
ENV CODE_VERSION 1.5.2
|
||||||
# download the source
|
# download the source
|
||||||
RUN buildDeps=' \
|
RUN buildDeps=' \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
unzip \
|
gnupg \
|
||||||
' \
|
' \
|
||||||
&& set -x \
|
&& set -x \
|
||||||
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
|
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
|
||||||
&& curl -sL https://deb.nodesource.com/setup | bash - \
|
&& curl -sL https://deb.nodesource.com/setup | bash - \
|
||||||
&& apt-get update && apt-get install -y nodejs --no-install-recommends \
|
&& apt-get update && apt-get install -y nodejs --no-install-recommends \
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
&& curl -sSL https://az764295.vo.msecnd.net/stable/fe7f407b95b7f78405846188259504b34ef72761/VSCode-linux-x64-stable.zip -o /tmp/vs.zip \
|
&& curl -sSL https://az764295.vo.msecnd.net/stable/66f37fd2a99eb9d628dd374d81d78835b410c39b/code_${CODE_VERSION}-1473686317_amd64.deb -o /tmp/vs.deb \
|
||||||
&& unzip /tmp/vs.zip -d /usr/src/ \
|
&& dpkg -i /tmp/vs.deb \
|
||||||
&& rm -rf /tmp/vs.zip \
|
&& rm -rf /tmp/vs.deb \
|
||||||
&& apt-get purge -y --auto-remove $buildDeps
|
&& apt-get purge -y --auto-remove $buildDeps
|
||||||
|
|
||||||
COPY start.sh /usr/local/bin/start.sh
|
COPY start.sh /usr/local/bin/start.sh
|
||||||
|
|
Loading…
Reference in New Issue
Block a user