Skip to content

K
k3s
Commit 1b787159 authored by Brad Davidson's avatar Brad Davidson
Browse files
Options

Update base image version in Dockerfiles

Should hopefully fix issues that cropped up with arm builds failing due to the sqlite libs from alpine 3.10 no longer being compatible with alpine edge, which was probably never a safe assumption to begin with. Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent 361e218f
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 7 deletions
Dockerfile.dapper
View file @ 1b787159
FROM golang:1.13.11-alpine3.10 FROM golang:1.13.14-alpine3.12
ARG http_proxy=$http_proxy ARG http_proxy=$http_proxy
ARG https_proxy=$https_proxy ARG https_proxy=$https_proxy
...@@ -8,9 +8,7 @@ ENV https_proxy=$https_proxy ...@@ -8,9 +8,7 @@ ENV https_proxy=$https_proxy
ENV no_proxy=$no_proxy ENV no_proxy=$no_proxy
RUN apk -U --no-cache add bash git gcc musl-dev docker vim less file curl wget ca-certificates jq linux-headers zlib-dev tar zip squashfs-tools npm coreutils \ RUN apk -U --no-cache add bash git gcc musl-dev docker vim less file curl wget ca-certificates jq linux-headers zlib-dev tar zip squashfs-tools npm coreutils \
python2 openssl-dev libffi-dev libseccomp libseccomp-dev make libuv-static python2 openssl-dev libffi-dev libseccomp libseccomp-dev make libuv-static sqlite-dev sqlite-static libselinux libselinux-dev zlib-dev zlib-static
RUN apk -U --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/main/ add sqlite-dev sqlite-static libselinux libselinux-dev
RUN mkdir -p /go/src/golang.org/x && \ RUN mkdir -p /go/src/golang.org/x && \
cd /go/src/golang.org/x && git clone https://github.com/golang/tools && cd tools && \ cd /go/src/golang.org/x && git clone https://github.com/golang/tools && cd tools && \
git checkout -b current aa82965741a9fecd12b026fbb3d3c6ed3231b8f8 && \ git checkout -b current aa82965741a9fecd12b026fbb3d3c6ed3231b8f8 && \
......
Dockerfile.manifest
View file @ 1b787159
FROM golang:1.13.8-alpine3.10 FROM golang:1.13.14-alpine3.12
COPY --from=plugins/manifest:1.2.3 /bin/* /bin/ COPY --from=plugins/manifest:1.2.3 /bin/* /bin/
......
Dockerfile.test.dapper
View file @ 1b787159
FROM golang:1.13.8-alpine3.10 FROM golang:1.13.14-alpine3.12
RUN apk -U --no-cache add bash git gcc musl-dev docker curl jq coreutils python2 openssl RUN apk -U --no-cache add bash git gcc musl-dev docker curl jq coreutils python2 openssl
......
package/Dockerfile
View file @ 1b787159
FROM alpine:3.10 as base FROM alpine:3.12 as base
RUN apk add -U ca-certificates RUN apk add -U ca-certificates
ADD build/out/data.tar.gz /image ADD build/out/data.tar.gz /image
RUN mkdir -p /image/etc/ssl/certs /image/run /image/var/run /image/tmp /image/lib/modules /image/lib/firmware && \ RUN mkdir -p /image/etc/ssl/certs /image/run /image/var/run /image/tmp /image/lib/modules /image/lib/firmware && \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment