github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 01:59:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3727 from deitch/embed-hashes

Browse Source
This commit is contained in:
Avi Deitcher 2021-11-05 04:46:45 -04:00 committed by GitHub
commit 01a1aac73c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/ci.yml vendored
View File

@ -26,10 +26,10 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Set up Go 1.13 - name: Set up Go 1.16
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.13.4 go-version: 1.16.7
id: go id: go
- name: Check out code - name: Check out code
@ -110,7 +110,7 @@ jobs:
key: ${{ runner.os }}-linuxkit-${{ github.sha }} key: ${{ runner.os }}-linuxkit-${{ github.sha }}
restore-keys: | restore-keys: |
${{ runner.os }}-linuxkit- ${{ runner.os }}-linuxkit-
- name: Build Packages - name: Build Packages
run: | run: |
make -C pkg build make -C pkg build
@ -157,7 +157,7 @@ jobs:
chmod ugo+x bin/linuxkit-amd64-linux chmod ugo+x bin/linuxkit-amd64-linux
sudo ln -s $(pwd)/bin/linuxkit-amd64-linux /usr/local/bin/linuxkit sudo ln -s $(pwd)/bin/linuxkit-amd64-linux /usr/local/bin/linuxkit
/usr/local/bin/linuxkit version /usr/local/bin/linuxkit version
- name: Restore Package Cache - name: Restore Package Cache
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
@ -165,7 +165,7 @@ jobs:
key: ${{ runner.os }}-linuxkit-${{ github.sha }} key: ${{ runner.os }}-linuxkit-${{ github.sha }}
restore-keys: | restore-keys: |
${{ runner.os }}-linuxkit- ${{ runner.os }}-linuxkit-
- name: Run Tests - name: Run Tests
run: | run: |
cd test cd test

2
src/cmd/linuxkit/go.mod
View File

@ -1,6 +1,6 @@
module github.com/linuxkit/linuxkit/src/cmd/linuxkit module github.com/linuxkit/linuxkit/src/cmd/linuxkit
go 1.15 go 1.16
require ( require (
github.com/Azure/azure-sdk-for-go v50.1.0+incompatible github.com/Azure/azure-sdk-for-go v50.1.0+incompatible

12
src/cmd/linuxkit/moby/images.yaml Normal file
View File

@ -0,0 +1,12 @@
iso: linuxkit/mkimage-iso:f0ba58e54282f481a87a2b487a70568c702f001b
iso-bios: linuxkit/mkimage-iso-bios:2fb7eea032a8f8ec76d9ca69592046875c50683c
iso-efi: linuxkit/mkimage-iso-efi:71c9dfc7de921e4521adbce03c01ce8282c0a9a5
raw-bios: linuxkit/mkimage-raw-bios:a0f4f6af871f9388639f2939a5e7bee5c467b736
raw-efi: linuxkit/mkimage-raw-efi:bc5d55daccfe1e75bc7373b4f45fc08e3b9adea9
squashfs: linuxkit/mkimage-squashfs:078f292e085fe31f508ff55a05eab958aec25e25
gcp: linuxkit/mkimage-gcp:a7416d21d4ef642bb2ba560c8f7651250823546d
qcow2-efi: linuxkit/mkimage-qcow2-efi:2a835e4ce894070268e5fa6f53be67007452095e
vhd: linuxkit/mkimage-vhd:4cc60c4f46b07e11c64ba618e46b81fa0096c91f
dynamic-vhd: linuxkit/mkimage-dynamic-vhd:99b9009ed54a793020d3ce8322a42e0cc06da71a
vmdk: linuxkit/mkimage-vmdk:b55ea46297a16d8a4448ce7f5a2df987a9602b27
rpi3: linuxkit/mkimage-rpi3:19c5354d6f8f68781adbc9bb62095ebb424222dc

37
src/cmd/linuxkit/moby/output.go
View File

@ -3,6 +3,7 @@ package moby
import ( import (
"archive/tar" "archive/tar"
"bytes" "bytes"
_ "embed"
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
@ -12,24 +13,12 @@ import (
"github.com/linuxkit/linuxkit/src/cmd/linuxkit/initrd" "github.com/linuxkit/linuxkit/src/cmd/linuxkit/initrd"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v2"
) )
var ( //go:embed images.yaml
outputImages = map[string]string{ var imagesBytes []byte
"iso": "linuxkit/mkimage-iso:f0ba58e54282f481a87a2b487a70568c702f001b", var outputImages map[string]string
"iso-bios": "linuxkit/mkimage-iso-bios:2fb7eea032a8f8ec76d9ca69592046875c50683c",
"iso-efi": "linuxkit/mkimage-iso-efi:71c9dfc7de921e4521adbce03c01ce8282c0a9a5",
"raw-bios": "linuxkit/mkimage-raw-bios:a0f4f6af871f9388639f2939a5e7bee5c467b736",
"raw-efi": "linuxkit/mkimage-raw-efi:bc5d55daccfe1e75bc7373b4f45fc08e3b9adea9",
"squashfs": "linuxkit/mkimage-squashfs:078f292e085fe31f508ff55a05eab958aec25e25",
"gcp": "linuxkit/mkimage-gcp:a7416d21d4ef642bb2ba560c8f7651250823546d",
"qcow2-efi": "linuxkit/mkimage-qcow2-efi:2a835e4ce894070268e5fa6f53be67007452095e",
"vhd": "linuxkit/mkimage-vhd:4cc60c4f46b07e11c64ba618e46b81fa0096c91f",
"dynamic-vhd": "linuxkit/mkimage-dynamic-vhd:99b9009ed54a793020d3ce8322a42e0cc06da71a",
"vmdk": "linuxkit/mkimage-vmdk:b55ea46297a16d8a4448ce7f5a2df987a9602b27",
"rpi3": "linuxkit/mkimage-rpi3:19c5354d6f8f68781adbc9bb62095ebb424222dc",
}
)
// UpdateOutputImages overwrite the docker images used to build the outputs // UpdateOutputImages overwrite the docker images used to build the outputs
// 'update' is a map where the key is the output format and the value is a LinuxKit 'mkimage' image. // 'update' is a map where the key is the output format and the value is a LinuxKit 'mkimage' image.
@ -224,9 +213,25 @@ func ensurePrereq(out, cache string) error {
return err return err
} }
// parseOutputImages parse the raw output image info
func parseOutputImages(b []byte) (map[string]string, error) {
var (
m map[string]string
)
err := yaml.Unmarshal(b, &m)
return m, err
}
// ValidateFormats checks if the format type is known // ValidateFormats checks if the format type is known
func ValidateFormats(formats []string, cache string) error { func ValidateFormats(formats []string, cache string) error {
log.Debugf("validating output: %v", formats) log.Debugf("validating output: %v", formats)
if outputImages == nil {
var err error
outputImages, err = parseOutputImages(imagesBytes)
if err != nil {
return err
}
}
for _, o := range formats { for _, o := range formats {
f := outFuns[o] f := outFuns[o]