Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2073 from brandond/update_docker_baseimage

Browse Source 
Update base image version in Dockerfiles
This commit is contained in:
Brad Davidson 2020-07-28 10:16:47 -07:00 committed by GitHub
commit 375c68524b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile.dapper
View File

@ -1,4 +1,4 @@
FROM golang:1.13.11-alpine3.10
FROM golang:1.13.14-alpine3.12
ARG http_proxy=$http_proxy
ARG https_proxy=$https_proxy
@ -8,9 +8,7 @@ ENV https_proxy=$https_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 \
python2 openssl-dev libffi-dev libseccomp libseccomp-dev make libuv-static
RUN apk -U --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/main/ add sqlite-dev sqlite-static libselinux libselinux-dev
python2 openssl-dev libffi-dev libseccomp libseccomp-dev make libuv-static sqlite-dev sqlite-static libselinux libselinux-dev zlib-dev zlib-static
RUN mkdir -p /go/src/golang.org/x && \
cd /go/src/golang.org/x && git clone https://github.com/golang/tools && cd tools && \
git checkout -b current aa82965741a9fecd12b026fbb3d3c6ed3231b8f8 && \

2
Dockerfile.manifest
View File

@ -1,4 +1,4 @@
FROM golang:1.13.8-alpine3.10
FROM golang:1.13.14-alpine3.12
COPY --from=plugins/manifest:1.2.3 /bin/* /bin/

2
Dockerfile.test.dapper
View File

@ -1,4 +1,4 @@
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

2
package/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.10 as base
FROM alpine:3.12 as base
RUN apk add -U ca-certificates
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 && \