mirror of
https://github.com/jessfraz/dockerfiles.git
synced 2024-11-23 11:31:49 +01:00
fixes
Signed-off-by: Jess Frazelle <acidburn@google.com>
This commit is contained in:
parent
0a0c49c90f
commit
d112cd4d9c
|
@ -26,7 +26,7 @@ RUN buildDeps=' \
|
||||||
zip \
|
zip \
|
||||||
' \
|
' \
|
||||||
set -x \
|
set -x \
|
||||||
&& apk --no-cache add $buildDeps \
|
&& apk --no-cache add --repository https://dl-3.alpinelinux.org/alpine/edge/community $buildDeps \
|
||||||
&& go get github.com/Soulou/curl-unix-socket \
|
&& go get github.com/Soulou/curl-unix-socket \
|
||||||
&& mv /go/bin/curl-unix-socket /usr/bin/ \
|
&& mv /go/bin/curl-unix-socket /usr/bin/ \
|
||||||
&& mkdir -p /go/src/github.com/hashicorp /etc/consul.d \
|
&& mkdir -p /go/src/github.com/hashicorp /etc/consul.d \
|
||||||
|
|
|
@ -19,9 +19,9 @@ FROM alpine:latest
|
||||||
MAINTAINER Jessie Frazelle <jess@linux.com>
|
MAINTAINER Jessie Frazelle <jess@linux.com>
|
||||||
|
|
||||||
# Install emacs:
|
# Install emacs:
|
||||||
# Note: Emacs is only in testing repo -> https://pkgs.alpinelinux.org/packages?package=emacs&repo=all&arch=x86_64
|
# Note: Emacs is only community repo -> https://pkgs.alpinelinux.org/packages?package=emacs&repo=all&arch=x86_64
|
||||||
RUN apk --no-cache add \
|
RUN apk --no-cache add \
|
||||||
--repository https://dl-3.alpinelinux.org/alpine/edge/testing/ \
|
--repository https://dl-3.alpinelinux.org/alpine/edge/community/ \
|
||||||
emacs
|
emacs
|
||||||
|
|
||||||
# Autorun doctor
|
# Autorun doctor
|
||||||
|
|
|
@ -19,9 +19,9 @@ FROM alpine:latest
|
||||||
MAINTAINER Jessie Frazelle <jess@linux.com>
|
MAINTAINER Jessie Frazelle <jess@linux.com>
|
||||||
|
|
||||||
# Install emacs:
|
# Install emacs:
|
||||||
# Note: Emacs is only in testing repo -> https://pkgs.alpinelinux.org/packages?package=emacs&repo=all&arch=x86_64
|
# Note: Emacs is only in community repo -> https://pkgs.alpinelinux.org/packages?package=emacs&repo=all&arch=x86_64
|
||||||
RUN apk --no-cache add \
|
RUN apk --no-cache add \
|
||||||
--repository https://dl-3.alpinelinux.org/alpine/edge/testing/ \
|
--repository https://dl-3.alpinelinux.org/alpine/edge/community/ \
|
||||||
emacs
|
emacs
|
||||||
|
|
||||||
# Autorun dunnet
|
# Autorun dunnet
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM debian:stretch
|
FROM debian:jessie
|
||||||
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 \
|
||||||
|
@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y \
|
||||||
libgomp1 \
|
libgomp1 \
|
||||||
libkrb5-3 \
|
libkrb5-3 \
|
||||||
libnss3 \
|
libnss3 \
|
||||||
libssl1.0.2 \
|
libssl1.0.0 \
|
||||||
openssl \
|
openssl \
|
||||||
--no-install-recommends \
|
--no-install-recommends \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
@ -26,7 +26,7 @@ RUN buildDeps=' \
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
&& git clone https://github.com/magnumripper/JohnTheRipper.git /usr/src/johntheripper \
|
&& git clone https://github.com/magnumripper/JohnTheRipper.git /usr/src/johntheripper \
|
||||||
&& cd /usr/src/johntheripper/src \
|
&& cd /usr/src/johntheripper/src \
|
||||||
&& ./configure \
|
&& ./configure || cat config.log \
|
||||||
&& make \
|
&& make \
|
||||||
&& cp -r ../run/* /usr/local/bin/ \
|
&& cp -r ../run/* /usr/local/bin/ \
|
||||||
&& rm -rf /usr/src/johntheripper \
|
&& rm -rf /usr/src/johntheripper \
|
||||||
|
|
|
@ -14,6 +14,7 @@ RUN set -x \
|
||||||
autoconf \
|
autoconf \
|
||||||
automake \
|
automake \
|
||||||
build-base \
|
build-base \
|
||||||
|
cmake \
|
||||||
curl-dev \
|
curl-dev \
|
||||||
git \
|
git \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
|
@ -21,6 +22,7 @@ RUN set -x \
|
||||||
&& git clone --depth 1 https://github.com/LastPass/lastpass-cli.git /usr/src/lastpass-cli \
|
&& git clone --depth 1 https://github.com/LastPass/lastpass-cli.git /usr/src/lastpass-cli \
|
||||||
&& ( \
|
&& ( \
|
||||||
cd /usr/src/lastpass-cli \
|
cd /usr/src/lastpass-cli \
|
||||||
|
&& cmake . \
|
||||||
&& make \
|
&& make \
|
||||||
&& make install \
|
&& make install \
|
||||||
) \
|
) \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM debian:sid
|
FROM ubuntu:16.04
|
||||||
MAINTAINER Christian Koep <christian.koep@fom-net.de>
|
MAINTAINER Christian Koep <christian.koep@fom-net.de>
|
||||||
|
|
||||||
ENV POWERSHELL_VERSION 6.0.0-alpha.13
|
ENV POWERSHELL_VERSION 6.0.0-alpha.13
|
||||||
|
@ -6,8 +6,10 @@ ENV POWERSHELL_VERSION 6.0.0-alpha.13
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
libunwind8 \
|
libcurl3 \
|
||||||
libicu55 \
|
libicu55 \
|
||||||
|
libssl1.0.0 \
|
||||||
|
libunwind8 \
|
||||||
dpkg \
|
dpkg \
|
||||||
--no-install-recommends \
|
--no-install-recommends \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
|
@ -19,9 +19,9 @@ FROM alpine:latest
|
||||||
MAINTAINER Jessie Frazelle <jess@linux.com>
|
MAINTAINER Jessie Frazelle <jess@linux.com>
|
||||||
|
|
||||||
# Install emacs:
|
# Install emacs:
|
||||||
# Note: Emacs is only in testing repo -> https://pkgs.alpinelinux.org/packages?package=emacs&repo=all&arch=x86_64
|
# Note: Emacs is only in community repo -> https://pkgs.alpinelinux.org/packages?package=emacs&repo=all&arch=x86_64
|
||||||
RUN apk --no-cache add \
|
RUN apk --no-cache add \
|
||||||
--repository https://dl-3.alpinelinux.org/alpine/edge/testing/ \
|
--repository https://dl-3.alpinelinux.org/alpine/edge/community/ \
|
||||||
emacs
|
emacs
|
||||||
|
|
||||||
# Autorun tetris
|
# Autorun tetris
|
||||||
|
|
|
@ -9,11 +9,12 @@ RUN apt-get update && apt-get install -y \
|
||||||
make \
|
make \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
ruby-dev \
|
ruby-dev \
|
||||||
|
ruby-fog \
|
||||||
zlib1g-dev \
|
zlib1g-dev \
|
||||||
--no-install-recommends \
|
--no-install-recommends \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
ENV VAGRANT_VERSION 1.9.0
|
ENV VAGRANT_VERSION 1.8.7
|
||||||
|
|
||||||
ADD https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_x86_64.deb /src/vagrant_${VAGRANT_VERSION}_x86_64.deb
|
ADD https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_x86_64.deb /src/vagrant_${VAGRANT_VERSION}_x86_64.deb
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user