chore(action): replace word Docker with Container

action/recipes/config.go

@@ -56,19 +56,19 @@ type CommonOpts struct {
 	//   had been previously checked out.
 	RepoPath string `json:"repo_path" validate:"required,dirpath"`
 
-	// Specifies the (relative) paths to directories where are produced files (inside Docker).
-	DockerOutputDirs []string `json:"docker_output_dirs" validate:"dive,dirpath"`
+	// Specifies the (relative) paths to directories where are produced files (inside Container).
+	ContainerOutputDirs []string `json:"docker_output_dirs" validate:"dive,dirpath"`
 
-	// Specifies the (relative) paths to produced files (inside Docker).
-	DockerOutputFiles []string `json:"docker_output_files" validate:"dive,filepath"`
+	// Specifies the (relative) paths to produced files (inside Container).
+	ContainerOutputFiles []string `json:"docker_output_files" validate:"dive,filepath"`
 
 	// Specifies the (relative) path to directory into which place the produced files.
-	//   Directories listed in DockerOutputDirs and files listed in DockerOutputFiles
+	//   Directories listed in ContainerOutputDirs and files listed in ContainerOutputFiles
 	//   will be exported here.
 	// Example:
 	//   Following setting:
-	//     DockerOutputDirs = []string{"Build/"}
-	//     DockerOutputFiles = []string{"coreboot.rom", "defconfig"}
+	//     ContainerOutputDirs = []string{"Build/"}
+	//     ContainerOutputFiles = []string{"coreboot.rom", "defconfig"}
 	//     OutputDir = "myOutput"
 	//   Will result in:
 	//     myOutput/
@@ -85,7 +85,7 @@ func (opts CommonOpts) GetArtifacts() *[]container.Artifacts {
 	var artifacts []container.Artifacts
 
 	// Directories
-	for _, pathDir := range opts.DockerOutputDirs {
+	for _, pathDir := range opts.ContainerOutputDirs {
 		artifacts = append(artifacts, container.Artifacts{
 			ContainerPath: filepath.Join(ContainerWorkDir, pathDir),
 			ContainerDir:  true,
@@ -95,7 +95,7 @@ func (opts CommonOpts) GetArtifacts() *[]container.Artifacts {
 	}
 
 	// Files
-	for _, pathFile := range opts.DockerOutputFiles {
+	for _, pathFile := range opts.ContainerOutputFiles {
 		artifacts = append(artifacts, container.Artifacts{
 			ContainerPath: filepath.Join(ContainerWorkDir, pathFile),
 			ContainerDir:  false,

action/recipes/coreboot_test.go

@@ -66,7 +66,7 @@ func TestCoreboot(t *testing.T) {
 	common := CommonOpts{
 		Arch:      "x86",
 		OutputDir: "output",
-		DockerOutputFiles: []string{
+		ContainerOutputFiles: []string{
 			"build/coreboot.rom",
 			"defconfig",
 		},

action/recipes/edk2.go

@@ -24,7 +24,7 @@ type Edk2Specific struct {
 	//     '-a <architecture>'
 	//     '-p <edk2__platform>'
 	//     '-b <edk2__release_type>'
-	//     '-t <GCC version>' (defined as part of docker toolchain, selected by SdkURL)
+	//     '-t <GCC version>' (defined as part of container toolchain, selected by SdkURL)
 	DefconfigPath string `json:"defconfig_path" validate:"filepath"`
 
 	// Specifies the DSC to use when building EDK2
@@ -47,7 +47,7 @@ type Edk2Specific struct {
 // Edk2Specific is used to store data specific to coreboot.
 type Edk2Specific struct {
 	// Specifies which build command to use
-	// GCC version is exposed in the docker container as USE_GCC_VERSION environment variable
+	// GCC version is exposed in the container container as USE_GCC_VERSION environment variable
 	// Examples:
 	//   "source ./edksetup.sh; build -t GCC5 -a IA32 -p UefiPayloadPkg/UefiPayloadPkg.dsc"
 	//   "python UefiPayloadPkg/UniversalPayloadBuild.py"

action/recipes/edk2_test.go

@@ -25,18 +25,18 @@ func TestEdk2(t *testing.T) {
 	defer os.Chdir(pwd) // nolint:errcheck
 
 	// Use "" if you want to test containers from github package registry
-	// Use "../../docker/edk2" if you want to test containers built fresh from Dockerfile
+	// Use "../../container/edk2" if you want to test containers built fresh from Dockerfile
 	dockerfilePath := ""
 	if false {
-		dockerfilePath, err = filepath.Abs("../../docker/edk2")
+		dockerfilePath, err = filepath.Abs("../../container/edk2")
 		assert.NoError(t, err)
 	}
 
 	common := CommonOpts{
 		SdkURL:           "ghcr.io/9elements/firmware-action/edk2-stable202105:main",
 		Arch:             "X64",
 		OutputDir:        "output",
-		DockerOutputDirs: []string{"Build/"},
+		ContainerOutputDirs: []string{"Build/"},
 	}
 
 	testCases := []struct {

action/recipes/linux_test.go

@@ -29,17 +29,17 @@ func TestLinux(t *testing.T) {
 	defer os.Chdir(pwd) // nolint:errcheck
 
 	// Use "" if you want to test containers from github package registry
-	// Use "../../docker/linux" if you want to test containers built fresh from Dockerfile
+	// Use "../../container/linux" if you want to test containers built fresh from Dockerfile
 	dockerfilePath := ""
 	if false {
-		dockerfilePath, err = filepath.Abs("../../docker/linux")
+		dockerfilePath, err = filepath.Abs("../../container/linux")
 		assert.NoError(t, err)
 	}
 
 	linuxOpts := LinuxOpts{
 		CommonOpts: CommonOpts{
 			OutputDir: "output",
-			DockerOutputFiles: []string{
+			ContainerOutputFiles: []string{
 				"vmlinux",
 				"defconfig",
 			},

tests/example_config.json

@@ -6,9 +6,9 @@
       "arch": "",
       "repo_path": "my_super_dooper_awesome_coreboot/",
       "defconfig_path": "seabios_defconfig",
-      "output_dir": "output/",
-      "docker_output_dirs": null,
-      "docker_output_files": [
+      "output_dir": "output-coreboot/",
+      "container_output_dirs": null,
+      "container_output_files": [
         "build/coreboot.rom",
         "defconfig"
       ],
@@ -31,9 +31,9 @@
       "arch": "x86_64",
       "repo_path": "linux-${LINUX_VERSION}/",
       "defconfig_path": "ci_defconfig",
-      "output_dir": "output/",
-      "docker_output_dirs": null,
-      "docker_output_files": [
+      "output_dir": "output-linux/",
+      "container_output_dirs": null,
+      "container_output_files": [
         "vmlinux",
         "defconfig"
       ],
@@ -47,11 +47,11 @@
       "arch": "X64",
       "repo_path": "Edk2/",
       "defconfig_path": "edk2_config.cfg",
-      "output_dir": "output/",
-      "docker_output_dirs": [
+      "output_dir": "output-edk2/",
+      "container_output_dirs": [
         "Build/"
       ],
-      "docker_output_files": null,
+      "container_output_files": null,
       "build_command": "source ./edksetup.sh; build -a X64 -p UefiPayloadPkg/UefiPayloadPkg.dsc -b DEBUG -t GCC5"
     }
   }