Skip to content

Commit

Permalink
Merge pull request #1213 from prymitive/dockerfile
Browse files Browse the repository at this point in the history
fix(build): don't upgrade packages during docker builds
  • Loading branch information
prymitive authored Dec 2, 2019
2 parents 1dd6296 + ac6f8c0 commit 107d466
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM node:12.13.1-alpine3.9 as nodejs-builder
RUN apk update && apk upgrade && apk add --update make git
FROM node:12.13.1-alpine as nodejs-builder
RUN apk add make git
COPY Makefile /src/Makefile
COPY ui /src/ui
RUN make -C /src ui

FROM golang:1.13.4-alpine as go-builder
RUN apk update && apk upgrade && apk add --update make git
RUN apk add make git
COPY Makefile /src/Makefile
COPY go.mod /src/go.mod
COPY go.sum /src/go.sum
Expand Down
10 changes: 5 additions & 5 deletions demo/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM node:12.13.1-alpine3.9 as nodejs-builder
RUN apk update && apk upgrade && apk add --update make git
FROM node:12.13.1-alpine as nodejs-builder
RUN apk add make git
COPY Makefile /src/Makefile
COPY ui /src/ui
RUN make -C /src ui

FROM golang:1.13.4-alpine as go-builder
RUN apk update && apk upgrade && apk add --update make git
RUN apk add make git
COPY Makefile /src/Makefile
COPY go.mod /src/go.mod
COPY go.sum /src/go.sum
Expand All @@ -18,15 +18,15 @@ ARG VERSION
RUN CGO_ENABLED=0 make -C /src VERSION="${VERSION:-dev}" karma

FROM alpine:3.10
RUN apk update && apk upgrade && apk add --update supervisor python && rm -rf /tmp/* /var/cache/apk/*
RUN apk add supervisor python && rm -rf /tmp/* /var/cache/apk/*
COPY demo/supervisord.conf /etc/supervisord.conf
COPY --from=prom/alertmanager:v0.19.0 /bin/alertmanager /alertmanager
COPY --from=lmierzwa/kthxbye:v0.5 /kthxbye /kthxbye
COPY demo/alertmanager.yaml /etc/alertmanager.yaml
COPY demo/generator.py /generator.py
COPY --from=go-builder /src/karma /karma
COPY demo/karma.yaml /etc/karma.yaml
COPY demo/custom.js /custom.js
COPY --from=lmierzwa/kthxbye:v0.5 /kthxbye /kthxbye
RUN adduser -D karma
USER karma
ENV GOGC=20
Expand Down
2 changes: 1 addition & 1 deletion internal/mapper/v017/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM quay.io/goswagger/swagger:v0.21.0

RUN apk update && apk upgrade && apk add --update curl
RUN apk add curl

COPY run.sh /run.sh

Expand Down

0 comments on commit 107d466

Please sign in to comment.