epic/play-with-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add multi-stage builds and fix safari scrollbar

Browse Source
This commit is contained in:
Marcos Lilljedahl
2017-05-23 16:18:02 -03:00
parent 3ecdd1ea52
commit db1c06a99f
4 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Dockerfile
View File

@@ -12,8 +12,15 @@ RUN go get -v -d ./...
RUN CGO_ENABLED=0 go build -a -installsuffix nocgo -o /go/bin/play-with-docker . RUN CGO_ENABLED=0 go build -a -installsuffix nocgo -o /go/bin/play-with-docker .
# Set the workdir to be /go/bin which is where the binaries are built FROM alpine
WORKDIR /go/bin
# Export the WORKDIR as a tar stream RUN apk --update add ca-certificates
CMD tar -cf - . RUN mkdir -p /app/pwd
COPY --from=0 /go/bin/play-with-docker /app/play-with-docker
COPY ./www /app/www
WORKDIR /app
CMD ["./play-with-docker"]
EXPOSE 3000

17
Dockerfile.dind
View File

@@ -1,14 +1,8 @@
ARG VERSION=17.05.0-ce-dind ARG VERSION=docker:17.05.0-ce-dind
FROM docker:${VERSION} FROM ${VERSION}
RUN apk add --no-cache git tmux py2-pip apache2-utils vim build-base gettext-dev curl bash-completion bash util-linux jq RUN apk add --no-cache git tmux py2-pip apache2-utils vim build-base gettext-dev curl bash-completion bash util-linux jq
ENV COMPOSE_VERSION=1.13.0
ENV MACHINE_VERSION=v0.11.0
# Install Compose and Machine
RUN pip install docker-compose==${COMPOSE_VERSION}
RUN curl -L https://github.com/docker/machine/releases/download/${MACHINE_VERSION}/docker-machine-Linux-x86_64 \
-o /usr/bin/docker-machine && chmod +x /usr/bin/docker-machine
# Compile and install httping # Compile and install httping
# (used in orchestration workshop, and very useful anyway) # (used in orchestration workshop, and very useful anyway)
@@ -18,6 +12,13 @@ RUN mkdir -p /opt && cd /opt && \
./configure && make install LDFLAGS=-lintl && \ ./configure && make install LDFLAGS=-lintl && \
rm -rf httping-2.5 rm -rf httping-2.5
ENV COMPOSE_VERSION=1.13.0
ENV MACHINE_VERSION=v0.11.0
# Install Compose and Machine
RUN pip install docker-compose==${COMPOSE_VERSION}
RUN curl -L https://github.com/docker/machine/releases/download/${MACHINE_VERSION}/docker-machine-Linux-x86_64 \
-o /usr/bin/docker-machine && chmod +x /usr/bin/docker-machine
# Add bash completion # Add bash completion
RUN mkdir /etc/bash_completion.d && curl https://raw.githubusercontent.com/docker/docker/master/contrib/completion/bash/docker -o /etc/bash_completion.d/docker RUN mkdir /etc/bash_completion.d && curl https://raw.githubusercontent.com/docker/docker/master/contrib/completion/bash/docker -o /etc/bash_completion.d/docker

3
build.sh
View File

@@ -1,3 +0,0 @@
#!/bin/bash
docker build -t builder .&& docker run --rm builder | docker build -t franela/play-with-docker:latest -

12
www/assets/style.css
View File

@@ -1,7 +1,7 @@
@import url('https://fonts.googleapis.com/css?family=Rationale'); @import url('https://fonts.googleapis.com/css?family=Rationale');
.selected button { .selected button {
background-color: rgba(158,158,158,0.2); background-color: rgba(158,158,158,0.2);
} }
md-card-content.terminal-container { md-card-content.terminal-container {
@@ -49,3 +49,13 @@ md-input-container .md-errors-spacer {
.stats { .stats {
min-height: 230px; min-height: 230px;
} }
::-webkit-scrollbar {
-webkit-appearance: none;
width: 7px;
}
::-webkit-scrollbar-thumb {
border-radius: 4px;
background-color: rgba(0,0,0,.5);
-webkit-box-shadow: 0 0 1px rgba(255,255,255,.5);
}