Bump files to use alpine:3.8

Bump Dockerfiles and mentions of alpine 3.7 to be now 3.8 Signed-off-by: Martin Dekov (VMware) <mdekov@vmware.com>
2025-06-08 08:25:03 +00:00 · 2018-11-16 03:12:26 -08:00 · 2018-11-16 03:12:26 -08:00 · ade5f32513
commit ade5f32513
parent 2944b9393c
24 changed files with 48 additions and 48 deletions
--- a/contrib/alertmanager-arm64/v0.15.0/Dockerfile
+++ b/contrib/alertmanager-arm64/v0.15.0/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8
 WORKDIR /root
 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/
@ -14,4 +14,4 @@ WORKDIR    /alertmanager

 ENTRYPOINT [ "/bin/alertmanager" ]
 CMD        [ "--config.file=/etc/alertmanager/alertmanager.yml", \
-             "--storage.path=/alertmanager" ]
+    "--storage.path=/alertmanager" ]
--- a/contrib/alertmanager-armhf/0.15.0/Dockerfile
+++ b/contrib/alertmanager-armhf/0.15.0/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8
 WORKDIR /root
 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/
@ -14,4 +14,4 @@ WORKDIR    /alertmanager

 ENTRYPOINT [ "/bin/alertmanager" ]
 CMD        [ "--config.file=/etc/alertmanager/alertmanager.yml", \
-             "--storage.path=/alertmanager" ]
+    "--storage.path=/alertmanager" ]
--- a/contrib/prometheus-arm64/2.3/Dockerfile
+++ b/contrib/prometheus-arm64/2.3/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8
 WORKDIR /root/

 RUN apk add --update libarchive-tools curl \
@ -25,7 +25,7 @@ WORKDIR    /prometheus

 ENTRYPOINT [ "/bin/prometheus" ]
 CMD        [ "--config.file=/etc/prometheus/prometheus.yml", \
-             "--storage.tsdb.path=/prometheus", \
-             "--web.console.libraries=/usr/share/prometheus/console_libraries", \
-             "--web.console.templates=/usr/share/prometheus/consoles" ]
+    "--storage.tsdb.path=/prometheus", \
+    "--web.console.libraries=/usr/share/prometheus/console_libraries", \
+    "--web.console.templates=/usr/share/prometheus/consoles" ]

--- a/contrib/prometheus-armhf/2.2/Dockerfile
+++ b/contrib/prometheus-armhf/2.2/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8
 WORKDIR /root/

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


--- a/gateway/Dockerfile
+++ b/gateway/Dockerfile
@ -4,8 +4,8 @@ ARG GIT_COMMIT_MESSAGE
 ARG VERSION='dev'

 RUN curl -sSfL https://github.com/alexellis/license-check/releases/download/0.2.2/license-check \
-      > /usr/bin/license-check \
-      && chmod +x /usr/bin/license-check
+    > /usr/bin/license-check \
+    && chmod +x /usr/bin/license-check

 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/*"))" \
    && go test $(go list ./... | grep -v integration | grep -v /vendor/ | grep -v /template/) -cover \
    && 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.GitCommitMessage=${GIT_COMMIT_MESSAGE}\"\
-     -X github.com/openfaas/faas/gateway/version.Version=${VERSION}" \
+    -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.Version=${VERSION}" \
    -a -installsuffix cgo -o gateway .

-FROM alpine:3.7
+FROM alpine:3.8

 LABEL org.label-schema.license="MIT" \
-      org.label-schema.vcs-url="https://github.com/openfaas/faas" \
-      org.label-schema.vcs-type="Git" \
-      org.label-schema.name="openfaas/faas" \
-      org.label-schema.vendor="openfaas" \
-      org.label-schema.docker.schema-version="1.0"
+    org.label-schema.vcs-url="https://github.com/openfaas/faas" \
+    org.label-schema.vcs-type="Git" \
+    org.label-schema.name="openfaas/faas" \
+    org.label-schema.vendor="openfaas" \
+    org.label-schema.docker.schema-version="1.0"

 RUN addgroup -S app \
    && adduser -S -g app app
--- a/gateway/Dockerfile.arm64
+++ b/gateway/Dockerfile.arm64
@ -20,7 +20,7 @@ COPY server.go      .
 #RUN license-check -path ./ --verbose=false \
 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 \
    && adduser -S -g app app
--- a/gateway/Dockerfile.armhf
+++ b/gateway/Dockerfile.armhf
@ -18,7 +18,7 @@ COPY server.go      .

 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/

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

--- a/sample-functions/AlpineFunction/Dockerfile.arm64
+++ b/sample-functions/AlpineFunction/Dockerfile.arm64
@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8

 RUN apk --no-cache add curl \
    && curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-arm64 > /usr/bin/fwatchdog \
--- a/sample-functions/ApiKeyProtected-Secrets/Dockerfile
+++ b/sample-functions/ApiKeyProtected-Secrets/Dockerfile
@ -14,7 +14,7 @@ COPY handler.go .

 RUN go install

-FROM alpine:3.7
+FROM alpine:3.8

 # Needed to reach the hub
 RUN apk --no-cache add ca-certificates 
--- a/sample-functions/CHelloWorld/src/Dockerfile
+++ b/sample-functions/CHelloWorld/src/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.7 as builder
+FROM alpine:3.8 as builder
 RUN apk add --no-cache curl \
    && curl -SL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
    && chmod +x /usr/bin/fwatchdog \
@ -7,12 +7,12 @@ RUN apk add --no-cache curl \
 WORKDIR /root/

 RUN apk add --no-cache gcc \
-                       musl-dev
+    musl-dev
 COPY main.c     .

 RUN gcc main.c -static -o /main \
- && chmod +x /main \
- && /main
+    && chmod +x /main \
+    && /main

 FROM scratch

--- a/sample-functions/CaptainsIntent/Dockerfile
+++ b/sample-functions/CaptainsIntent/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8
 RUN apk --update add nodejs nodejs-npm

 RUN apk --no-cache add curl \
--- a/sample-functions/ChangeColorIntent/Dockerfile
+++ b/sample-functions/ChangeColorIntent/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8
 RUN apk --update add nodejs nodejs-npm

 RUN apk --no-cache add curl \
--- a/sample-functions/DockerHubStats/Dockerfile
+++ b/sample-functions/DockerHubStats/Dockerfile
@ -13,7 +13,7 @@ COPY . /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats

 RUN make install

-FROM alpine:3.7
+FROM alpine:3.8

 # Needed to reach the hub
 RUN apk --no-cache add ca-certificates 
--- a/sample-functions/DockerHubStats/Dockerfile.armhf
+++ b/sample-functions/DockerHubStats/Dockerfile.armhf
@ -13,7 +13,7 @@ COPY . /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats

 RUN make install

-FROM alpine:3.7
+FROM alpine:3.8

 # Needed to reach the hub
 RUN apk --no-cache add ca-certificates 
--- a/sample-functions/HostnameIntent/Dockerfile
+++ b/sample-functions/HostnameIntent/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8
 RUN apk --update add nodejs nodejs-npm

 RUN apk --no-cache add curl \
--- a/sample-functions/MarkdownRender/Dockerfile
+++ b/sample-functions/MarkdownRender/Dockerfile
@ -14,7 +14,7 @@ COPY vendor vendor

 RUN go install

-FROM alpine:3.7
+FROM alpine:3.8

 # Needed to reach the hub
 RUN apk --no-cache add ca-certificates 
--- a/sample-functions/NodeInfo/Dockerfile
+++ b/sample-functions/NodeInfo/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8

 RUN apk --update add nodejs nodejs-npm

--- a/sample-functions/NodeInfo/Dockerfile.arm64
+++ b/sample-functions/NodeInfo/Dockerfile.arm64
@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8

 RUN apk --update add nodejs nodejs-npm

--- a/sample-functions/NodeInfo/Dockerfile.armhf
+++ b/sample-functions/NodeInfo/Dockerfile.armhf
@ -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 curl \
--- a/sample-functions/ResizeImageMagick/Dockerfile.armhf
+++ b/sample-functions/ResizeImageMagick/Dockerfile.armhf
@ -1,4 +1,4 @@
-FROM arm32v6/alpine:3.7
+FROM arm32v6/alpine:3.8

 RUN apk --no-cache add imagemagick

--- a/sample-functions/WebhookStash/Dockerfile
+++ b/sample-functions/WebhookStash/Dockerfile
@ -14,7 +14,7 @@ COPY handler.go .

 RUN go install

-FROM alpine:3.7
+FROM alpine:3.8

 # Needed to reach the hub
 RUN apk --no-cache add ca-certificates 
--- a/sample-functions/figlet/Dockerfile.armhf
+++ b/sample-functions/figlet/Dockerfile.armhf
@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8

 RUN apk --no-cache add curl \
    && curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-armhf > /usr/bin/fwatchdog \
--- a/sample-functions/gif-maker/Dockerfile
+++ b/sample-functions/gif-maker/Dockerfile
@ -1,9 +1,9 @@
-FROM alpine:3.7
+FROM alpine:3.8

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