faas-rs/faas
1
0
Fork 0
mirror of https://github.com/openfaas/faas.git synced 2025-06-09 08:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump files to use alpine:3.8

Browse Source 
Bump Dockerfiles and mentions of alpine 3.7 to be now
3.8

Signed-off-by: Martin Dekov (VMware) <mdekov@vmware.com>
This commit is contained in:
Martin Dekov (VMware) 2018-11-16 03:12:26 -08:00 committed by Alex Ellis
parent 2944b9393c
commit ade5f32513
24 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/alertmanager-arm64/v0.15.0/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.7 FROM alpine:3.8
WORKDIR /root WORKDIR /root
RUN apk add --update libarchive-tools RUN apk add --update libarchive-tools
ADD https://github.com/prometheus/alertmanager/releases/download/v0.15.0/alertmanager-0.15.0.linux-arm64.tar.gz /root/ ADD https://github.com/prometheus/alertmanager/releases/download/v0.15.0/alertmanager-0.15.0.linux-arm64.tar.gz /root/
@ -14,4 +14,4 @@ WORKDIR /alertmanager
ENTRYPOINT [ "/bin/alertmanager" ] ENTRYPOINT [ "/bin/alertmanager" ]
CMD [ "--config.file=/etc/alertmanager/alertmanager.yml", \ CMD [ "--config.file=/etc/alertmanager/alertmanager.yml", \
"--storage.path=/alertmanager" ] "--storage.path=/alertmanager" ]

4
contrib/alertmanager-armhf/0.15.0/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.7 FROM alpine:3.8
WORKDIR /root WORKDIR /root
RUN apk add --update libarchive-tools RUN apk add --update libarchive-tools
ADD https://github.com/prometheus/alertmanager/releases/download/v0.15.0/alertmanager-0.15.0.linux-armv7.tar.gz /root/ ADD https://github.com/prometheus/alertmanager/releases/download/v0.15.0/alertmanager-0.15.0.linux-armv7.tar.gz /root/
@ -14,4 +14,4 @@ WORKDIR /alertmanager
ENTRYPOINT [ "/bin/alertmanager" ] ENTRYPOINT [ "/bin/alertmanager" ]
CMD [ "--config.file=/etc/alertmanager/alertmanager.yml", \ CMD [ "--config.file=/etc/alertmanager/alertmanager.yml", \
"--storage.path=/alertmanager" ] "--storage.path=/alertmanager" ]

8
contrib/prometheus-arm64/2.3/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.7 FROM alpine:3.8
WORKDIR /root/ WORKDIR /root/
RUN apk add --update libarchive-tools curl \ RUN apk add --update libarchive-tools curl \
@ -25,7 +25,7 @@ WORKDIR /prometheus
ENTRYPOINT [ "/bin/prometheus" ] ENTRYPOINT [ "/bin/prometheus" ]
CMD [ "--config.file=/etc/prometheus/prometheus.yml", \ CMD [ "--config.file=/etc/prometheus/prometheus.yml", \
"--storage.tsdb.path=/prometheus", \ "--storage.tsdb.path=/prometheus", \
"--web.console.libraries=/usr/share/prometheus/console_libraries", \ "--web.console.libraries=/usr/share/prometheus/console_libraries", \
"--web.console.templates=/usr/share/prometheus/consoles" ] "--web.console.templates=/usr/share/prometheus/consoles" ]

8
contrib/prometheus-armhf/2.2/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.7 FROM alpine:3.8
WORKDIR /root/ WORKDIR /root/
RUN apk add --update libarchive-tools curl \ RUN apk add --update libarchive-tools curl \
@ -24,8 +24,8 @@ VOLUME [ "/prometheus" ]
WORKDIR /prometheus WORKDIR /prometheus
ENTRYPOINT [ "/bin/prometheus" ] ENTRYPOINT [ "/bin/prometheus" ]
CMD [ "--config.file=/etc/prometheus/prometheus.yml", \ CMD [ "--config.file=/etc/prometheus/prometheus.yml", \
"--storage.tsdb.path=/prometheus", \ "--storage.tsdb.path=/prometheus", \
"--web.console.libraries=/usr/share/prometheus/console_libraries", \ "--web.console.libraries=/usr/share/prometheus/console_libraries", \
"--web.console.templates=/usr/share/prometheus/consoles" ] "--web.console.templates=/usr/share/prometheus/consoles" ]

22
gateway/Dockerfile
View File

@ -4,8 +4,8 @@ ARG GIT_COMMIT_MESSAGE
ARG VERSION='dev' ARG VERSION='dev'
RUN curl -sSfL https://github.com/alexellis/license-check/releases/download/0.2.2/license-check \ RUN curl -sSfL https://github.com/alexellis/license-check/releases/download/0.2.2/license-check \
> /usr/bin/license-check \ > /usr/bin/license-check \
&& chmod +x /usr/bin/license-check && chmod +x /usr/bin/license-check
WORKDIR /go/src/github.com/openfaas/faas/gateway WORKDIR /go/src/github.com/openfaas/faas/gateway
@ -28,19 +28,19 @@ RUN license-check -path ./ --verbose=false "Alex Ellis" "OpenFaaS Project" "Open
&& test -z "$(gofmt -l $(find . -type f -name '*.go' -not -path "./vendor/*"))" \ && test -z "$(gofmt -l $(find . -type f -name '*.go' -not -path "./vendor/*"))" \
&& go test $(go list ./... | grep -v integration | grep -v /vendor/ | grep -v /template/) -cover \ && go test $(go list ./... | grep -v integration | grep -v /vendor/ | grep -v /template/) -cover \
&& CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w \ && CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w \
-X github.com/openfaas/faas/gateway/version.GitCommitSHA=${GIT_COMMIT_SHA}\ -X github.com/openfaas/faas/gateway/version.GitCommitSHA=${GIT_COMMIT_SHA}\
-X \"github.com/openfaas/faas/gateway/version.GitCommitMessage=${GIT_COMMIT_MESSAGE}\"\ -X \"github.com/openfaas/faas/gateway/version.GitCommitMessage=${GIT_COMMIT_MESSAGE}\"\
-X github.com/openfaas/faas/gateway/version.Version=${VERSION}" \ -X github.com/openfaas/faas/gateway/version.Version=${VERSION}" \
-a -installsuffix cgo -o gateway . -a -installsuffix cgo -o gateway .
FROM alpine:3.7 FROM alpine:3.8
LABEL org.label-schema.license="MIT" \ LABEL org.label-schema.license="MIT" \
org.label-schema.vcs-url="https://github.com/openfaas/faas" \ org.label-schema.vcs-url="https://github.com/openfaas/faas" \
org.label-schema.vcs-type="Git" \ org.label-schema.vcs-type="Git" \
org.label-schema.name="openfaas/faas" \ org.label-schema.name="openfaas/faas" \
org.label-schema.vendor="openfaas" \ org.label-schema.vendor="openfaas" \
org.label-schema.docker.schema-version="1.0" org.label-schema.docker.schema-version="1.0"
RUN addgroup -S app \ RUN addgroup -S app \
&& adduser -S -g app app && adduser -S -g app app

2
gateway/Dockerfile.arm64
View File

@ -20,7 +20,7 @@ COPY server.go .
#RUN license-check -path ./ --verbose=false \ #RUN license-check -path ./ --verbose=false \
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o gateway . RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o gateway .
FROM alpine:3.7 FROM alpine:3.8
RUN addgroup -S app \ RUN addgroup -S app \
&& adduser -S -g app app && adduser -S -g app app

2
gateway/Dockerfile.armhf
View File

@ -18,7 +18,7 @@ COPY server.go .
RUN GOARM=7 CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o gateway . RUN GOARM=7 CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o gateway .
FROM alpine:3.7 FROM alpine:3.8
WORKDIR /root/ WORKDIR /root/
EXPOSE 8080 EXPOSE 8080

2
guide/deployment_swarm_arm.md
View File

@ -142,7 +142,7 @@ $ faas-cli build -f callme.yml
Building: alexellis/callme:armhf with node template. Please wait.. Building: alexellis/callme:armhf with node template. Please wait..
docker build -t alexellis/callme:armhf . docker build -t alexellis/callme:armhf .
Sending build context to Docker daemon 8.704kB Sending build context to Docker daemon 8.704kB
Step 1/16 : FROM alpine:3.7 Step 1/16 : FROM alpine:3.8
---> 16566b7ed19e ---> 16566b7ed19e
... ...

2
sample-functions/AlpineFunction/Dockerfile.arm64
View File

@ -1,4 +1,4 @@
FROM alpine:3.7 FROM alpine:3.8
RUN apk --no-cache add curl \ RUN apk --no-cache add curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-arm64 > /usr/bin/fwatchdog \ && curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-arm64 > /usr/bin/fwatchdog \

2
sample-functions/ApiKeyProtected-Secrets/Dockerfile
View File

@ -14,7 +14,7 @@ COPY handler.go .
RUN go install RUN go install
FROM alpine:3.7 FROM alpine:3.8
# Needed to reach the hub # Needed to reach the hub
RUN apk --no-cache add ca-certificates RUN apk --no-cache add ca-certificates

8
sample-functions/CHelloWorld/src/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.7 as builder FROM alpine:3.8 as builder
RUN apk add --no-cache curl \ RUN apk add --no-cache curl \
&& curl -SL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \ && curl -SL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog \
@ -7,12 +7,12 @@ RUN apk add --no-cache curl \
WORKDIR /root/ WORKDIR /root/
RUN apk add --no-cache gcc \ RUN apk add --no-cache gcc \
musl-dev musl-dev
COPY main.c . COPY main.c .
RUN gcc main.c -static -o /main \ RUN gcc main.c -static -o /main \
&& chmod +x /main \ && chmod +x /main \
&& /main && /main
FROM scratch FROM scratch

2
sample-functions/CaptainsIntent/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.7 FROM alpine:3.8
RUN apk --update add nodejs nodejs-npm RUN apk --update add nodejs nodejs-npm
RUN apk --no-cache add curl \ RUN apk --no-cache add curl \

2
sample-functions/ChangeColorIntent/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.7 FROM alpine:3.8
RUN apk --update add nodejs nodejs-npm RUN apk --update add nodejs nodejs-npm
RUN apk --no-cache add curl \ RUN apk --no-cache add curl \

2
sample-functions/DockerHubStats/Dockerfile
View File

@ -13,7 +13,7 @@ COPY . /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats
RUN make install RUN make install
FROM alpine:3.7 FROM alpine:3.8
# Needed to reach the hub # Needed to reach the hub
RUN apk --no-cache add ca-certificates RUN apk --no-cache add ca-certificates

2
sample-functions/DockerHubStats/Dockerfile.armhf
View File

@ -13,7 +13,7 @@ COPY . /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats
RUN make install RUN make install
FROM alpine:3.7 FROM alpine:3.8
# Needed to reach the hub # Needed to reach the hub
RUN apk --no-cache add ca-certificates RUN apk --no-cache add ca-certificates

2
sample-functions/HostnameIntent/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.7 FROM alpine:3.8
RUN apk --update add nodejs nodejs-npm RUN apk --update add nodejs nodejs-npm
RUN apk --no-cache add curl \ RUN apk --no-cache add curl \

2
sample-functions/MarkdownRender/Dockerfile
View File

@ -14,7 +14,7 @@ COPY vendor vendor
RUN go install RUN go install
FROM alpine:3.7 FROM alpine:3.8
# Needed to reach the hub # Needed to reach the hub
RUN apk --no-cache add ca-certificates RUN apk --no-cache add ca-certificates

2
sample-functions/NodeInfo/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.7 FROM alpine:3.8
RUN apk --update add nodejs nodejs-npm RUN apk --update add nodejs nodejs-npm

2
sample-functions/NodeInfo/Dockerfile.arm64
View File

@ -1,4 +1,4 @@
FROM alpine:3.7 FROM alpine:3.8
RUN apk --update add nodejs nodejs-npm RUN apk --update add nodejs nodejs-npm

2
sample-functions/NodeInfo/Dockerfile.armhf
View File

@ -1,4 +1,4 @@
FROM alpine:3.7 FROM alpine:3.8
RUN apk --no-cache add nodejs nodejs-npm RUN apk --no-cache add nodejs nodejs-npm
RUN apk --no-cache add curl \ RUN apk --no-cache add curl \

2
sample-functions/ResizeImageMagick/Dockerfile.armhf
View File

@ -1,4 +1,4 @@
FROM arm32v6/alpine:3.7 FROM arm32v6/alpine:3.8
RUN apk --no-cache add imagemagick RUN apk --no-cache add imagemagick

2
sample-functions/WebhookStash/Dockerfile
View File

@ -14,7 +14,7 @@ COPY handler.go .
RUN go install RUN go install
FROM alpine:3.7 FROM alpine:3.8
# Needed to reach the hub # Needed to reach the hub
RUN apk --no-cache add ca-certificates RUN apk --no-cache add ca-certificates

2
sample-functions/figlet/Dockerfile.armhf
View File

@ -1,4 +1,4 @@
FROM alpine:3.7 FROM alpine:3.8
RUN apk --no-cache add curl \ RUN apk --no-cache add curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-armhf > /usr/bin/fwatchdog \ && curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-armhf > /usr/bin/fwatchdog \

8
sample-functions/gif-maker/Dockerfile
View File

@ -1,9 +1,9 @@
FROM alpine:3.7 FROM alpine:3.8
RUN apk --no-cache add ffmpeg gifsicle curl \ RUN apk --no-cache add ffmpeg gifsicle curl \
&& curl -LS https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \ && curl -LS https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog \
&& apk del curl && apk del curl
WORKDIR /root/ WORKDIR /root/
COPY entry.sh . COPY entry.sh .
ENV fprocess="./entry.sh" ENV fprocess="./entry.sh"