rancher/osbuilder
1
0
Fork 0
mirror of https://github.com/kairos-io/osbuilder.git synced 2025-09-26 14:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make it work (with hardcoded path)

Browse Source 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
This commit is contained in:
Dimitris Karakasilis
2023-09-06 13:34:38 +03:00
parent 7364f5293b
commit 3117e3196f
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tools-image/enki/pkg/action/converter.go
View File

@@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"os" "os"
"os/exec" "os/exec"
"path"
) )
// ConverterAction is the action that converts a non-kairos image to a Kairos one. // ConverterAction is the action that converts a non-kairos image to a Kairos one.
@@ -29,7 +30,7 @@ func NewConverterAction(rootfsPath string) *ConverterAction {
// The best way to do that is to spin up a container with the upstream // The best way to do that is to spin up a container with the upstream
// image (gcr.io/kaniko-project/executor:latest) and mount enki in it. // image (gcr.io/kaniko-project/executor:latest) and mount enki in it.
// E.g. // E.g.
// docker run -it -e PATH=/kaniko -v /tmp -v /home/dimitris/workspace/kairos/osbuilder/tmp/:/context -v "$PWD/build/enki":/enki --rm --entrypoint "/enki" gcr.io/kaniko-project/executor:latest convert /context // CGO_ENABLED=0 go build -ldflags '-extldflags "-static"' -o build/enki && docker run -it -e PATH=/kaniko -v /tmp -v /home/dimitris/workspace/kairos/osbuilder/tmp/rootfs/:/context -v "$PWD/build/enki":/enki -v $PWD:/build --rm --entrypoint "/enki" gcr.io/kaniko-project/executor:latest convert /context
func (ca *ConverterAction) Run() (err error) { func (ca *ConverterAction) Run() (err error) {
dockerfile, err := ca.createDockerfile() dockerfile, err := ca.createDockerfile()
if err != nil { if err != nil {
@@ -66,8 +67,11 @@ COPY . .
FROM rootfs FROM rootfs
RUN echo "nameserver 8.8.8.8" > /etc/resolv.conf
RUN cat /etc/resolv.conf
# TODO: Do more clever things # TODO: Do more clever things
RUN apt-get install -y curl RUN apt-get update && apt-get install -y curl
`) `)
if _, err := f.Write(data); err != nil { if _, err := f.Write(data); err != nil {
@@ -82,11 +86,29 @@ RUN apt-get install -y curl
// Create a .dockerignore in the rootfs directory to skip these: // Create a .dockerignore in the rootfs directory to skip these:
// https://github.com/GoogleContainerTools/kaniko/pull/1724/files#diff-1e90758e2fb0f26bdbfe7a40aafc4b4796cbf808842703e52e16c1f36b8da7dcR89 // https://github.com/GoogleContainerTools/kaniko/pull/1724/files#diff-1e90758e2fb0f26bdbfe7a40aafc4b4796cbf808842703e52e16c1f36b8da7dcR89
func (ca *ConverterAction) addDockerIgnore() error { func (ca *ConverterAction) addDockerIgnore() error {
content := `
/dev
/proc
/run
/sys
/var/run
`
f, err := os.Create(path.Join(ca.rootFSPath, ".dockerignore"))
if err != nil {
return err
}
defer f.Close()
if _, err := f.Write([]byte(content)); err != nil {
return err
}
return nil return nil
} }
func (ca *ConverterAction) removeDockerIgnore() error { func (ca *ConverterAction) removeDockerIgnore() error {
return nil return os.RemoveAll(path.Join(ca.rootFSPath, ".dockerignore"))
} }
func (ca *ConverterAction) BuildWithKaniko(dockerfile string) (string, error) { func (ca *ConverterAction) BuildWithKaniko(dockerfile string) (string, error) {
@@ -95,7 +117,7 @@ func (ca *ConverterAction) BuildWithKaniko(dockerfile string) (string, error) {
"--dockerfile", dockerfile, "--dockerfile", dockerfile,
"--context", ca.rootFSPath, "--context", ca.rootFSPath,
"--destination", "whatever", "--destination", "whatever",
"--tar-path", "image.tar", // TODO: Where do we write? Do we want this extracted to the rootFSPath? "--tar-path", "/build/image.tar", // TODO: Where do we write? Do we want this extracted to the rootFSPath?
"--no-push", "--no-push",
) )