mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-09-21 15:47:28 +00:00
Merge pull request #3702 from deitch/alpine-314
bump alpine to 3.14, remove go version hack
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
|
||||
FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror
|
||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
|
||||
RUN apk add --no-cache --initdb -p /out \
|
||||
alpine-baselayout \
|
||||
@@ -8,7 +8,7 @@ RUN apk add --no-cache --initdb -p /out \
|
||||
musl
|
||||
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
|
||||
|
||||
FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS build
|
||||
FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS build
|
||||
RUN apk add --no-cache \
|
||||
build-base \
|
||||
git \
|
||||
|
@@ -3,16 +3,16 @@ kernel:
|
||||
image: linuxkit/kernel:5.10.76
|
||||
cmdline: "console=ttyS0"
|
||||
init:
|
||||
- linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de
|
||||
- linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1
|
||||
- linuxkit/init:eb597ef74d808b5320ad1060b1620a6ac31e7ced
|
||||
- linuxkit/runc:21dbbda709ae138de0af6b0c7e4ae49525db5e88
|
||||
onboot:
|
||||
- name: test-ns
|
||||
image: linuxkit/test-ns:<hash>
|
||||
image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca
|
||||
command: ["/bin/sh", "/runp-runc-net.sh", "mix-unix"]
|
||||
# command: ["/bin/sh", "/runc-net.sh", "-l", "5", "-i", "2", "-c", "5", "-p", "unix", "-ip", "6"]
|
||||
mounts: # for runc
|
||||
- type: cgroup
|
||||
options: ["rw"]
|
||||
- name: poweroff
|
||||
image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f
|
||||
image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c
|
||||
command: ["/bin/sh", "/poweroff.sh", "3"]
|
||||
|
Reference in New Issue
Block a user