Skip to content

Commit

Permalink
Add support for other operating systems
Browse files Browse the repository at this point in the history
Signed-off-by: Nathanael DEMACON <ndemacon@scaleway.com>
  • Loading branch information
quantumsheep committed May 9, 2023
1 parent 68b4ce9 commit a84a952
Show file tree
Hide file tree
Showing 14 changed files with 70 additions and 24 deletions.
4 changes: 2 additions & 2 deletions acceptance/testdata/launcher/exec.d/fd_unix.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build linux || darwin
// +build linux darwin
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos

package main

Expand Down
4 changes: 2 additions & 2 deletions acceptance/variables_unix.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build linux || darwin
// +build linux darwin
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos

package acceptance

Expand Down
4 changes: 2 additions & 2 deletions archive/tar_unix.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build linux || darwin
// +build linux darwin
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos

package archive

Expand Down
15 changes: 15 additions & 0 deletions internal/extend/kaniko/dockerfile_applier_others.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//go:build aix || dragonfly || freebsd || netbsd || openbsd || solaris || zos
// +build aix dragonfly freebsd netbsd openbsd solaris zos

package kaniko

import (
v1 "github.com/google/go-containerregistry/pkg/v1"

"github.com/buildpacks/lifecycle/internal/extend"
"github.com/buildpacks/lifecycle/log"
)

func (a *DockerfileApplier) Apply(dockerfile extend.Dockerfile, toBaseImage v1.Image, withBuildOptions extend.Options, logger log.Logger) (v1.Image, error) {
return nil, nil
}
31 changes: 31 additions & 0 deletions internal/fsutil/os_detection_freebsd_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
//go:build freebsd
// +build freebsd

package fsutil_test

import (
"testing"

"github.com/buildpacks/lifecycle/internal/fsutil"
h "github.com/buildpacks/lifecycle/testhelpers"

"github.com/sclevine/spec"
"github.com/sclevine/spec/report"
)

func TestDetectorUnix(t *testing.T) {
spec.Run(t, "DetectorUnix", testDetectorUnix, spec.Report(report.Terminal{}))
}

func testDetectorUnix(t *testing.T, when spec.G, it spec.S) {
when("we should have a file", func() {
it("returns true correctly", func() {
h.AssertEq(t, (&fsutil.Detect{}).HasSystemdFile(), true)
})
it("returns the file contents", func() {
s, err := (&fsutil.Detect{}).ReadSystemdFile()
h.AssertNil(t, err)
h.AssertStringContains(t, s, "NAME")
})
})
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build windows || darwin
// +build windows darwin
//go:build windows || aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
// +build windows aix darwin dragonfly freebsd linux netbsd openbsd solaris zos

package fsutil_test

Expand Down
4 changes: 2 additions & 2 deletions internal/path/defaults_unix.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build linux || darwin
// +build linux darwin
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos

package path

Expand Down
4 changes: 2 additions & 2 deletions launch/exec_d_unix.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build linux || darwin
// +build linux darwin
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos

package launch

Expand Down
4 changes: 2 additions & 2 deletions launch/launcher_unix.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build linux || darwin
// +build linux darwin
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos

package launch

Expand Down
4 changes: 2 additions & 2 deletions launch/testdata/cmd/execd/fd_unix.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build linux || darwin
// +build linux darwin
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos

package main

Expand Down
4 changes: 2 additions & 2 deletions launch/testhelpers/syscall_unix.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build linux || darwin
// +build linux darwin
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos

package testhelpers

Expand Down
4 changes: 2 additions & 2 deletions layers/layers_unix_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build linux || darwin
// +build linux darwin
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos

package layers_test

Expand Down
4 changes: 2 additions & 2 deletions priv/sock_unix.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build linux || darwin
// +build linux darwin
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos

package priv

Expand Down
4 changes: 2 additions & 2 deletions testhelpers/vars_linux.go → testhelpers/vars_unix.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build linux
// +build linux
//go:build aix || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
// +build aix dragonfly freebsd linux netbsd openbsd solaris zos

package testhelpers

Expand Down

0 comments on commit a84a952

Please sign in to comment.