feat(convert): export ENV vars (#411)

* feat(convert): export ENV vars We could have passed these into the "build_env:" directive, however it appears environment substitution is also allowed such as PATH=/usr/local/sbin:$PATH for that layer, which is harder to figure out. Instead just "export" them in the "run:" directive. Signed-off-by: Ramkumar Chinchani <rchincha@cisco.com> * ci(convert): add a workflow to convert upstream repos Signed-off-by: Ramkumar Chinchani <rchincha@cisco.com> --------- Signed-off-by: Ramkumar Chinchani <rchincha@cisco.com>
project-stacker · Mar 2, 2023 · e577430 · e577430
1 parent 5a2e32b
commit e577430
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 37 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -55,9 +55,8 @@ jobs:
           REGISTRY_URL: localhost:5000
       - name: Upload code coverage
         uses: codecov/codecov-action@v3
-      - if: github.event_name == 'release' && github.event.action == 'published'
-        uses: actions/cache@v3
+      - uses: actions/cache@v3
         id: restore-build
         with:
           path: stacker
-          key: ${{ github.event.release.tag_name }}-${{ steps.short-sha.outputs.sha }}
+          key: ${{ steps.short-sha.outputs.sha }}
diff --git a/.github/workflows/convert.yaml b/.github/workflows/convert.yaml
@@ -0,0 +1,82 @@
+name: "convert dockerfiles"
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+env:
+  REGISTRY_URL: localhost:5000
+
+jobs:
+  ci:
+    uses: ./.github/workflows/build.yaml
+    with:
+      # note >-, args needs to be strings to be used as inputs
+      # for the reusable build.yaml workflow
+      go-version: >-
+        ["1.20.x"]
+      privilege-level: >-
+        ["priv"]
+  convert:
+    name: "convert"
+    runs-on: ubuntu-20.04
+    # needs ci for the cached stacker binary
+    needs: ci
+    steps:
+      - uses: benjlevesque/short-sha@v2.1
+        id: short-sha
+      - uses: actions/cache@v3
+        id: restore-build
+        with:
+          path: stacker
+          key: ${{ steps.short-sha.outputs.sha }}
+      - name: zot registry
+        env:
+          ZOT_HOST: localhost
+          ZOT_PORT: 5000
+        run: |
+          # start a zot instance (minimal)
+          podman run -p ${ZOT_PORT}:${ZOT_PORT} ghcr.io/project-zot/zot-minimal-linux-amd64:latest
+          # check if reachable
+          while true; do x=0; curl -f http://${REGISTRY_URL}/v2/ || x=1; if [ $x -eq 0 ]; then break; fi; sleep 1; done
+      - name: alpine
+        run: |
+          export PATH=$PATH:$GITHUB_WORKSPACE
+          git clone https://github.com/alpinelinux/docker-alpine.git
+          chmod -R a+rwx docker-alpine
+          cd docker-alpine
+          mkdir -p /out
+          chmod -R a+rwx /out
+          stacker convert --docker-file Dockerfile --output-file stacker.yaml --substitute-file stacker-subs.yaml
+          stacker build -f stacker.yaml --substitute-file stacker-subs.yaml --substitute IMAGE=alpine
+          stacker publish -f stacker.yaml --substitute-file stacker-subs.yaml --substitute IMAGE=alpine --skip-tls --url docker://${REGISTRY_URL} --layer alpine --tag latest
+          rm -f stacker.yaml stacker-subs.yaml
+          stacker clean
+          cd $GITHUB_WORKSPACE
+          rm -rf docker-alpine
+      - name: elasticsearch
+        run: |
+          export PATH=$PATH:$GITHUB_WORKSPACE
+          git clone https://github.com/elastic/dockerfiles.git
+          chmod -R a+rwx dockerfiles
+          cd dockerfiles/elasticsearch
+          stacker convert --docker-file Dockerfile --output-file stacker.yaml --substitute-file stacker-subs.yaml
+          stacker build -f stacker.yaml --substitute-file stacker-subs.yaml --substitute IMAGE=elasticsearch
+          stacker publish -f stacker.yaml --substitute-file stacker-subs.yaml --substitute IMAGE=elasticsearch --skip-tls --url docker://${REGISTRY_URL} --layer elasticsearch
+          rm -f stacker.yaml stacker-subs.yaml
+          stacker clean
+          cd $GITHUB_WORKSPACE
+          rm -rf dockerfiles
+      - name: python
+        run: |
+          export PATH=$PATH:$GITHUB_WORKSPACE
+          git clone https://github.com/docker-library/python.git
+          cd python/3.11/alpine3.17
+          chmod -R a+rw .
+          stacker convert --docker-file Dockerfile --output-file stacker.yaml --substitute-file stacker-subs.yaml
+          stacker build -f stacker.yaml --substitute-file stacker-subs.yaml --substitute IMAGE=python
+          stacker publish -f stacker.yaml --substitute-file stacker-subs.yaml --substitute IMAGE=python --skip-tls --url docker://${REGISTRY_URL} --layer python --tag latest
+          rm -f stacker.yaml stacker-subs.yaml
+          stacker clean
+          cd $GITHUB_WORKSPACE
+          rm -rf python
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -27,7 +27,7 @@ jobs:
         id: restore-build
         with:
           path: stacker
-          key: ${{ github.event.release.tag_name }}-${{ steps.short-sha.outputs.sha }}
+          key: ${{ steps.short-sha.outputs.sha }}
       - if: github.event_name == 'release' && github.event.action == 'published'
         name: Publish artifacts on releases
         uses: svenstaro/upload-release-action@v2

diff --git a/pkg/stacker/convert.go b/pkg/stacker/convert.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -32,6 +33,7 @@ type Converter struct {
 	currLayer string
 	subs      map[string]string
 	args      []string
+	env       map[string]string
 	// per-layer state
 	currDir string
 	currUid string
@@ -98,6 +100,11 @@ func (c *Converter) convertCommand(cmd *Command) error {
 		}
 		c.output[c.currLayer] = &layer
 	case "run":
+		// setup the environment
+		for k, v := range c.env {
+			layer.Run = append(layer.Run, fmt.Sprintf("export %s=%s", k, v))
+		}
+
 		// replace any ARGs first
 		for i, val := range cmd.Value {
 			for _, arg := range c.args {
@@ -123,7 +130,8 @@ func (c *Converter) convertCommand(cmd *Command) error {
 
 		for _, line := range cmd.Value {
 			// patch some cmds
-			line = strings.ReplaceAll(line, "mkdir", "mkdir -p ")
+			re := regexp.MustCompile(`\bmkdir\b`)
+			line = re.ReplaceAllString(line, "mkdir -p")
 
 			if c.currUid == "" {
 				// picking 'bash' here
@@ -183,11 +191,11 @@ func (c *Converter) convertCommand(cmd *Command) error {
 			}
 		}
 
-		if layer.Environment == nil {
-			layer.Environment = map[string]string{}
+		if c.env == nil {
+			c.env = map[string]string{}
 		}
 
-		layer.Environment[cmd.Value[0]] = val
+		c.env[cmd.Value[0]] = val
 	case "workdir":
 		layer.Run = append(layer.Run, fmt.Sprintf("cd %s", cmd.Value[0]))
 		c.currDir = cmd.Value[0]

diff --git a/test/convert.bats b/test/convert.bats
@@ -30,37 +30,11 @@ EOF
   # build should now work
   ## docker build -t test
   mkdir -p /out
-  stacker build -f stacker.yaml --substitute-file stacker-subs.yaml
-  rm -f stacker.yaml stacker-subs.yaml
-  stacker clean
-}
-
-@test "build alpine image" {
-  git clone https://github.com/alpinelinux/docker-alpine.git
-  chmod -R a+rwx docker-alpine
-  cd docker-alpine
-  mkdir -p /out
-  chmod -R a+rwx /out
-  stacker convert --docker-file Dockerfile --output-file stacker.yaml --substitute-file stacker-subs.yaml
-  stacker build -f stacker.yaml --substitute-file stacker-subs.yaml --substitute IMAGE=alpine
-  if [ -z "${REGISTRY_URL}" ]; then
-      skip "skipping test because no registry found in REGISTRY_URL env variable"
-  fi
-  stacker publish -f stacker.yaml --substitute-file stacker-subs.yaml --substitute IMAGE=alpine --skip-tls --url docker://${REGISTRY_URL} --tag latest
-  rm -f stacker.yaml stacker-subs.yaml
-  stacker clean
-}
-
-@test "build elasticsearch image" {
-  git clone https://github.com/elastic/dockerfiles.git
-  chmod -R a+rwx dockerfiles
-  cd dockerfiles/elasticsearch
-  stacker convert --docker-file Dockerfile --output-file stacker.yaml --substitute-file stacker-subs.yaml
-  stacker build -f stacker.yaml --substitute-file stacker-subs.yaml --substitute IMAGE=elasticsearch
+  stacker build -f stacker.yaml --substitute-file stacker-subs.yaml --substitute IMAGE=app
   if [ -z "${REGISTRY_URL}" ]; then
-      skip "skipping test because no registry found in REGISTRY_URL env variable"
+    skip "skipping test because no registry found in REGISTRY_URL env variable"
   fi
-  stacker publish -f stacker.yaml --substitute-file stacker-subs.yaml --substitute IMAGE=elasticsearch --skip-tls --url docker://${REGISTRY_URL} --tag latest
+  stacker publish -f stacker.yaml --substitute-file stacker-subs.yaml --substitute IMAGE=app --skip-tls --url docker://${REGISTRY_URL} --layer app --tag latest
   rm -f stacker.yaml stacker-subs.yaml
   stacker clean
 }