Update Dockerfile

Signed-off-by: Itxaka <itxakaserrano@gmail.com>
Update Dockerfile
2025-12-24 12:22:35 +00:00 · 2024-02-27 10:11:38 +01:00 · 2024-02-22 00:23:31 +01:00 · 2024-02-21 20:59:13 +01:00 · 2024-02-21 20:16:07 +01:00 · 2024-02-21 19:15:11 +00:00
16 changed files with 98 additions and 45 deletions
--- a/.github/workflows/bump_repos.yml
+++ b/.github/workflows/bump_repos.yml
@@ -7,7 +7,7 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Install earthly
        uses: Luet-lab/luet-install-action@v1
        with:
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Prepare
        id: prep
@@ -50,14 +50,14 @@ jobs:

      - name: Login to DockerHub
        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          registry: quay.io
          username: ${{ secrets.QUAY_USERNAME }}
          password: ${{ secrets.QUAY_PASSWORD }}

      - name: Build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
        with:
          builder: ${{ steps.buildx.outputs.name }}
          context: .
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Test
        run: |
          make kind-e2e-tests
@@ -26,7 +26,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Test
        run: |
          make controller-tests
--- a/.github/workflows/tool-image.yml
+++ b/.github/workflows/tool-image.yml
@@ -16,7 +16,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Prepare
        id: prep
@@ -49,14 +49,14 @@ jobs:

      - name: Login to DockerHub
        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          registry: quay.io
          username: ${{ secrets.QUAY_USERNAME }}
          password: ${{ secrets.QUAY_PASSWORD }}

      - name: Build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
        with:
          builder: ${{ steps.buildx.outputs.name }}
          context: ./tools-image
@@ -64,5 +64,3 @@ jobs:
          platforms: linux/amd64,linux/arm64
          push: true
          tags: ${{ steps.prep.outputs.tags }}
-          build-args: |
-            ENKI_VERSION=v0.0.3
--- a/go.mod
+++ b/go.mod
@@ -3,8 +3,8 @@ module github.com/kairos-io/osbuilder
 go 1.18

 require (
-	github.com/onsi/ginkgo/v2 v2.11.0
-	github.com/onsi/gomega v1.27.10
+	github.com/onsi/ginkgo/v2 v2.14.0
+	github.com/onsi/gomega v1.30.0
 	github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
 	k8s.io/api v0.24.0
 	k8s.io/apimachinery v0.24.0
@@ -29,7 +29,7 @@ require (
 	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
 	github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
 	github.com/fsnotify/fsnotify v1.5.1 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-logr/zapr v1.2.0 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.19.5 // indirect
@@ -39,7 +39,7 @@ require (
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/gnostic v0.5.7-v3refs // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
 	github.com/google/uuid v1.1.2 // indirect
@@ -60,14 +60,14 @@ require (
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.21.0 // indirect
-	golang.org/x/crypto v0.11.0 // indirect
-	golang.org/x/net v0.12.0 // indirect
+	golang.org/x/crypto v0.16.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/term v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/term v0.15.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
-	golang.org/x/tools v0.9.3 // indirect
+	golang.org/x/tools v0.16.1 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
--- a/go.sum
+++ b/go.sum
@@ -166,6 +166,8 @@ github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTg
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
 github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
+github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/zapr v1.2.0 h1:n4JnPI1T3Qq1SFEi/F8rwLrZERp2bso19PJZDB9dayk=
 github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
@@ -244,6 +246,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
@@ -387,6 +391,12 @@ github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
 github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
 github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU=
 github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM=
+github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
+github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
+github.com/onsi/ginkgo/v2 v2.13.2 h1:Bi2gGVkfn6gQcjNjZJVO8Gf0FHzMPf2phUei9tejVMs=
+github.com/onsi/ginkgo/v2 v2.13.2/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM=
+github.com/onsi/ginkgo/v2 v2.14.0 h1:vSmGj2Z5YPb9JwCWT6z6ihcUvDhuXLc3sJiqd3jMKAY=
+github.com/onsi/ginkgo/v2 v2.14.0/go.mod h1:JkUdW7JkN0V6rFvsHcJ478egV3XH9NxpD27Hal/PhZw=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
@@ -394,6 +404,8 @@ github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU=
 github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRahPmr4=
 github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
 github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
+github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
+github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
@@ -544,6 +556,10 @@ golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSO
 golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
 golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
+golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -634,6 +650,10 @@ golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
 golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
+golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -733,12 +753,22 @@ golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
 golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
+golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -752,6 +782,10 @@ golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
 golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -823,6 +857,12 @@ golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
 golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
 golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
+golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
+golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
+golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
+golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
+golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
--- a/tests/fixtures/simple.yaml
+++ b/tests/fixtures/simple.yaml
@@ -31,7 +31,7 @@ spec:
          fi
          menuentry "install" --class os --unrestricted {
              echo Loading kernel...
-              $linux ($root)/boot/kernel.xz cdroot root=live:CDLABEL=COS_LIVE rd.live.dir=/ rd.live.squashimg=rootfs.squashfs console=tty1 console=ttyS0 rd.cos.disable vga=795 nomodeset nodepair.enable
+              $linux ($root)/boot/kernel.xz cdroot root=live:CDLABEL=COS_LIVE rd.live.dir=/ rd.live.squashimg=rootfs.squashfs console=tty1 console=ttyS0 rd.cos.disable vga=795 nomodeset install-mode
              echo Loading initrd...
              $initrd ($root)/boot/rootfs.xz
          }
--- a/tools-image/Dockerfile
+++ b/tools-image/Dockerfile
@@ -1,7 +1,7 @@
 # https://quay.io/repository/kairos/packages?tab=tags&tag=latest
 ARG LEAP_VERSION=15.5
-ARG LUET_VERSION=0.34.0
-ARG ENKI_VERSION=v0.0.3
+ARG LUET_VERSION=0.35.0
+ARG ENKI_VERSION=v0.0.20

 FROM quay.io/luet/base:$LUET_VERSION AS luet
 FROM quay.io/kairos/enki:${ENKI_VERSION} as enki
@@ -9,7 +9,10 @@ FROM quay.io/kairos/enki:${ENKI_VERSION} as enki
 FROM opensuse/leap:$LEAP_VERSION as default
 RUN zypper ref && zypper dup -y
 ## ISO+ Arm image + Netboot + cloud images Build depedencies
-RUN zypper ref && zypper in -y bc qemu-tools jq cdrtools docker git curl gptfdisk kpartx sudo xfsprogs parted util-linux-systemd e2fsprogs curl util-linux udev rsync grub2 dosfstools grub2-x86_64-efi squashfs mtools xorriso lvm2 zstd
+RUN zypper ref && zypper in -y bc qemu-tools jq cdrtools docker git curl gptfdisk kpartx sudo xfsprogs parted  \
+    util-linux-systemd e2fsprogs curl util-linux udev rsync grub2 dosfstools grub2-x86_64-efi squashfs mtools xorriso lvm2 zstd
+RUN zypper in -y python311-pip python311-cryptography sbsigntools tpm2-* # ukify deps
+RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 1  # make python3.11 the default python3 for ukify
 COPY --from=luet /usr/bin/luet /usr/bin/luet
 ENV LUET_NOLOCK=true
 ENV TMPDIR=/tmp
@@ -21,6 +24,14 @@ COPY luet-amd64.yaml /tmp/luet-amd64.yaml
 RUN mkdir -p /etc/luet/
 RUN cp /tmp/luet-${TARGETARCH}.yaml /etc/luet/luet.yaml

+## Uki artifacts, will be set under the /usr/kairos directory
+RUN luet install -y system/systemd-boot
+
+# ukify + measure
+RUN luet install -y system/systemd-ukify
+# ukify deps that are not in the suse repos as packages. ukify package provides this so we have the exact versions needed
+RUN pip3 install -r /usr/kairos/ukify-requirements.txt
+
 ## Live CD artifacts
 RUN luet install -y livecd/grub2 --system-target /grub2
 RUN luet install -y livecd/grub2-efi-image --system-target /efi
--- a/tools-image/arm/boards/rpi4.sh
+++ b/tools-image/arm/boards/rpi4.sh
@@ -2,8 +2,6 @@

 partprobe

-kpartx -va $DRIVE
-
 image=$1

 if [ -z "$image" ]; then
--- a/tools-image/build-arm-image.sh
+++ b/tools-image/build-arm-image.sh
@@ -73,8 +73,12 @@ cleanup() {
  fi

  losetup -D "${LOOP}" || true;
-  dmsetup remove KairosVG-oem || true;
-  dmsetup remove KairosVG-recovery || true;
+  losetup -D "${DRIVE}" || true;
+
+  if [ "$model" == "rpi3" ]; then
+    dmsetup remove KairosVG-oem || true;
+    dmsetup remove KairosVG-recovery || true;
+  fi
 }

 ensure_dir_structure() {
@@ -364,14 +368,19 @@ if [ "$model" == "rpi3" ]; then
    sgdisk -m 1:2:3:4 ${output_image}
    sfdisk --part-type ${output_image} 1 c
 elif [ "$model" == "rpi4" ]; then
-    echo "label: gpt" | sfdisk "${output_image}"
-    sgdisk -n 1:8192:+96M -c 1:EFI -t 1:0c00 ${output_image}
+    sgdisk -n 1:0:+96M -c 1:EFI -t 1:ef00 ${output_image}
+    partprobe
    sgdisk -n 2:0:+${state_size}M -c 2:state -t 2:8300 ${output_image}
+    partprobe
    sgdisk -n 3:0:+${recovery_size}M -c 3:recovery -t 3:8300 ${output_image}
+    partprobe
    sgdisk -n 4:0:+${oem_size}M -c 4:oem -t 4:8300 ${output_image}
+    partprobe
    sgdisk -n 5:0:+64M -c 5:persistent -t 5:8300 ${output_image}
-    sgdisk -g ${output_image}
-    sgdisk -m 1:2:3:4:5 ${output_image}
+    partprobe
+    # Move backup header to end of disk
+    sgdisk -e ${output_image}
+    sgdisk -v ${output_image}
 else
    sgdisk -n 1:8192:+16M -c 1:EFI -t 1:0700 ${output_image}
    sgdisk -n 2:0:+${state_size}M -c 2:state -t 2:8300 ${output_image}
@@ -423,12 +432,12 @@ fi
 # Create partitions (RECOVERY, STATE, COS_PERSISTENT)
 mkfs.vfat -F 32 ${efi}
 fatlabel ${efi} COS_GRUB
-mkfs.ext4 -F -L ${STATE_LABEL} $state
-mkfs.ext4 -F -L ${PERSISTENT_LABEL} $persistent
+mkfs.ext3 -F -L ${STATE_LABEL} $state
+mkfs.ext3 -F -L ${PERSISTENT_LABEL} $persistent

 if [ "$model" == 'rpi4' ]; then
-  mkfs.ext4 -F -L ${RECOVERY_LABEL} $recovery
-  mkfs.ext4 -F -L ${OEM_LABEL} $oem
+  mkfs.ext3 -F -L ${RECOVERY_LABEL} $recovery
+  mkfs.ext3 -F -L ${OEM_LABEL} $oem
 else
  pvcreate $recovery
  vgcreate KairosVG $recovery
--- a/tools-image/config.yaml
+++ b/tools-image/config.yaml
@@ -1,6 +1,3 @@
 iso:
-  uefi:
-  - dir:/efi
  image:
-  - dir:/efi
  - dir:/grub2
--- a/tools-image/entrypoint.sh
+++ b/tools-image/entrypoint.sh
@@ -2,4 +2,4 @@

 set -ex

-enki --config-dir /config $@
+enki --config-dir /config "$@"
--- a/tools-image/ipxe.tmpl
+++ b/tools-image/ipxe.tmpl
@@ -2,6 +2,6 @@

 set dns 8.8.8.8
 ifconf
-kernel ${RELEASE_URL}/${VERSION}/${ISO_NAME}-kernel root=live:${RELEASE_URL}/${VERSION}/${ISO_NAME}.squashfs initrd=${ISO_NAME}-initrd rd.neednet=1 ip=dhcp rd.cos.disable netboot nodepair.enable config_url=${config} console=tty1 console=ttyS0 rd.live.overlay.overlayfs ${cmdline}
+kernel ${RELEASE_URL}/${VERSION}/${ISO_NAME}-kernel root=live:${RELEASE_URL}/${VERSION}/${ISO_NAME}.squashfs initrd=${ISO_NAME}-initrd rd.neednet=1 ip=dhcp rd.cos.disable netboot install-mode config_url=${config} console=tty1 console=ttyS0 rd.live.overlay.overlayfs ${cmdline}
 initrd ${RELEASE_URL}/${VERSION}/${ISO_NAME}-initrd
 boot
--- a/tools-image/luet-amd64.yaml
+++ b/tools-image/luet-amd64.yaml
@@ -12,4 +12,4 @@ repositories:
    priority: 2
    urls:
      - "quay.io/kairos/packages"
-    reference: 20231121153938-repository.yaml
+    reference: 20240221184509-repository.yaml
--- a/tools-image/luet-arm64.yaml
+++ b/tools-image/luet-arm64.yaml
@@ -12,4 +12,4 @@ repositories:
    priority: 2
    urls:
      - "quay.io/kairos/packages-arm64"
-    reference: 20231121155055-repository.yaml
+    reference: 20240221191055-repository.yaml
--- a/tools-image/netboot.sh
+++ b/tools-image/netboot.sh
@@ -19,7 +19,7 @@ set initrd $ARTIFACT_NAME-initrd
 set rootfs $ARTIFACT_NAME.squashfs
 # set config https://example.com/machine-config
 # set cmdline extra.values=1
-kernel \${url}/\${kernel} initrd=\${initrd} ip=dhcp rd.cos.disable root=live:\${url}/\${rootfs} netboot nodepair.enable config_url=\${config} console=tty1 console=ttyS0 \${cmdline}
+kernel \${url}/\${kernel} initrd=\${initrd} ip=dhcp rd.cos.disable root=live:\${url}/\${rootfs} netboot install-mode config_url=\${config} console=tty1 console=ttyS0 \${cmdline}
 initrd \${url}/\${initrd}
 boot
 EOF
Author	SHA1	Message	Date
Itxaka	beabe36c36	Update Dockerfile Signed-off-by: Itxaka <itxakaserrano@gmail.com>	2024-02-27 10:11:38 +01:00
Itxaka	0fe28a034f	Update Dockerfile Signed-off-by: Itxaka <itxakaserrano@gmail.com>	2024-02-22 00:23:31 +01:00
Itxaka	db9c52985b	install the proper arch for systemd-boot Signed-off-by: Itxaka <itxakaserrano@gmail.com>	2024-02-21 20:59:13 +01:00
Itxaka	fbe3874152	Merge pull request #144 from ci-forks/create-pull-request/patch	2024-02-21 20:16:07 +01:00
Itxaka	77756071c6	⬆️ Update repositories Signed-off-by: GitHub <noreply@github.com>	2024-02-21 19:15:11 +00:00
Dimitris Karakasilis	ee5df3f0ea	Bump enki version (#145 ) Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>	2024-02-19 18:23:28 +02:00
Itxaka	cbc77a5493	Merge pull request #143 from kairos-io/ukify	2024-02-19 16:04:21 +01:00
Itxaka	7813c2eec4	Revert to using leap as base image for tool image Signed-off-by: Itxaka <itxaka@kairos.io>	2024-02-19 16:03:55 +01:00
Itxaka	32cd7c76cb	Use ukify from packages Signed-off-by: Itxaka <itxaka@kairos.io>	2024-02-17 11:11:30 +01:00
Itxaka	82c9a08353	Merge pull request #142 from kairos-io/Itxaka-patch-1	2024-02-16 20:11:19 +01:00
Itxaka	dcd3b4be97	Update Dockerfile Signed-off-by: Itxaka <itxakaserrano@gmail.com>	2024-02-16 20:11:01 +01:00
Itxaka	cedc294836	Merge pull request #141 from kairos-io/systemd_boot_artifacts	2024-02-16 17:29:51 +01:00
Itxaka	c0fc19b345	Update tools-image/Dockerfile Co-authored-by: Mauro Morales <mauro.morales@spectrocloud.com> Signed-off-by: Itxaka <itxaka@kairos.io>	2024-02-16 16:52:57 +01:00
Itxaka	40477e3ceb	Provide systemd-boot artifacts on osbuilder image Signed-off-by: Itxaka <itxaka@kairos.io>	2024-02-16 12:20:20 +01:00
Ettore Di Giacinto	7df2f481f8	fix(entrypoint.sh): quote when passing-by arguments (#140 ) Signed-off-by: Ettore Di Giacinto <mudler@users.noreply.github.com>	2024-02-15 18:07:25 +01:00
Itxaka	907b32d5e5	Merge pull request #139 from kairos-io/bump_fedora	2024-02-14 11:12:47 +01:00
Itxaka	446807680b	Merge branch 'master' into bump_fedora Signed-off-by: Itxaka <itxakaserrano@gmail.com>	2024-02-14 11:12:41 +01:00
Itxaka	e118e769fe	Improve osbuidler arm scripts Use ext3 for partitions Do not let the rpi4 script recreate the mapping Only call dmsetup if we are on rpi3 Try to remove the final image loop device as well Signed-off-by: Itxaka <itxaka@kairos.io>	2024-02-14 11:11:25 +01:00
Itxaka	97b58723a9	Merge pull request #133 from ci-forks/create-pull-request/patch	2024-02-12 14:41:53 +01:00
Itxaka	8570a9ed85	revert small sgdisk change Signed-off-by: Itxaka <itxakaserrano@gmail.com>	2024-02-12 14:41:45 +01:00
mudler	aa04578df9	⬆️ Update repositories Signed-off-by: GitHub <noreply@github.com>	2024-02-11 20:07:05 +00:00
Itxaka	39cfe7af30	Merge pull request #137 from kairos-io/bump_fedora	2024-02-10 17:14:03 +01:00
Itxaka	10d5f627fc	Use fedora 40 Signed-off-by: Itxaka <itxaka@kairos.io>	2024-02-10 17:13:39 +01:00
Itxaka	89dec58dd9	Merge pull request #136 from kairos-io/bump_fedora	2024-02-10 11:20:29 +01:00
Itxaka	54ae9607ee	Use Fedora 38 Looks like fedora 39 is broken Signed-off-by: Itxaka <itxaka@kairos.io>	2024-02-10 11:20:02 +01:00
Itxaka	ddb88c0e2e	Merge pull request #135 from kairos-io/bump_fedora	2024-02-10 10:48:00 +01:00
Itxaka	2c18ce3fbd	Use fedora 40 for os tools container Fixes an issue with sgdisk creating the disk images properly Alos removes some uneeded options from the rpi4 disk cration: - `-g` option mean to transform mbr to gptt, but the disk was already gpt - `-m` option tried to make the disk mbr from gpt... not sure why that was there - creating the disk with gpt. There is no need as sgdisk will default to create a gpt disk Signed-off-by: Itxaka <itxaka@kairos.io>	2024-02-10 10:45:52 +01:00
Itxaka	7c417e773f	Merge pull request #131 from ci-forks/create-pull-request/patch	2024-02-08 09:35:35 +01:00
mudler	ba9290acb7	⬆️ Update repositories Signed-off-by: GitHub <noreply@github.com>	2024-02-07 20:07:19 +00:00
Itxaka	627d7e87ed	Merge pull request #130 from ci-forks/create-pull-request/patch	2024-02-07 16:10:17 +01:00
Itxaka	f00b095ec1	⬆️ Update repositories Signed-off-by: GitHub <noreply@github.com>	2024-02-07 15:10:04 +00:00
Itxaka	10b1baff0d	Merge pull request #129 from kairos-io/fix_arm64_build	2024-02-07 11:20:28 +01:00
Itxaka	5c13bd2bdc	Fix arm64 build for os tools Signed-off-by: Itxaka <itxaka@kairos.io>	2024-02-07 11:10:17 +01:00
Itxaka	c86be82d66	Merge pull request #128 from kairos-io/move_tools_fedora	2024-02-07 10:03:21 +01:00
Itxaka	104eb89548	Merge branch 'master' into move_tools_fedora	2024-02-06 11:16:38 +01:00
Itxaka	815a9e2898	Move tool image to fedora Signed-off-by: Itxaka <itxaka@kairos.io>	2024-02-06 10:31:09 +01:00
Mauro Morales	52475cf069	Merge pull request #126 from ci-forks/create-pull-request/patch ⬆️ Update repositories	2024-02-05 22:08:40 +01:00
mudler	f30e9a6a6a	⬆️ Update repositories Signed-off-by: GitHub <noreply@github.com>	2024-02-05 20:15:37 +00:00
renovate[bot]	7005550b32	Update quay.io/kairos/enki Docker tag to v0.0.16	2024-02-05 16:21:35 +00:00
Itxaka	18959ee26a	Merge pull request #121 from ci-forks/create-pull-request/patch ⬆️ Update repositories	2024-02-02 22:34:40 +01:00
Itxaka	cbc6ca3fc0	⬆️ Update repositories Signed-off-by: GitHub <noreply@github.com>	2024-02-02 20:49:19 +00:00
Itxaka	44fb9dc165	Merge pull request #124 from kairos-io/Itxaka-patch-1	2024-02-02 21:48:05 +01:00
Itxaka	902c311c17	Update Dockerfile Signed-off-by: Itxaka <itxakaserrano@gmail.com>	2024-02-02 21:11:57 +01:00
renovate[bot]	f8a2ff5531	Update quay.io/kairos/enki Docker tag to v0.0.13	2024-02-01 01:23:20 +00:00
Itxaka	ca2d1fc9cc	Merge pull request #119 from ci-forks/create-pull-request/patch	2024-01-30 17:49:38 +01:00
renovate[bot]	c2748aecad	Update quay.io/kairos/enki Docker tag to v0.0.12	2024-01-30 16:49:15 +00:00
Itxaka	b834974606	⬆️ Update repositories Signed-off-by: GitHub <noreply@github.com>	2024-01-30 16:48:37 +00:00
Itxaka	30f8b9cb1c	Merge pull request #112 from ci-forks/create-pull-request/patch	2024-01-30 15:32:08 +01:00
Itxaka	2b601c1420	Merge pull request #118 from kairos-io/nodepair_enable	2024-01-30 15:29:52 +01:00
Itxaka	e5cded4980	Rename modepair.enable to install-mode Signed-off-by: Itxaka <itxaka@kairos.io>	2024-01-30 14:39:07 +01:00
renovate[bot]	a482917a27	Update quay.io/kairos/enki Docker tag to v0.0.11	2024-01-30 00:40:16 +00:00
mudler	48c41866ed	⬆️ Update repositories Signed-off-by: GitHub <noreply@github.com>	2024-01-26 20:07:08 +00:00
renovate[bot]	89f39c7ada	Update quay.io/kairos/enki Docker tag to v0.0.10	2024-01-25 22:06:52 +00:00
renovate[bot]	5158b5b7f3	Update quay.io/kairos/enki Docker tag to v0.0.8	2024-01-24 22:20:35 +00:00
Itxaka	d73c9528b1	Merge pull request #110 from ci-forks/create-pull-request/patch	2024-01-12 16:07:50 +01:00
Itxaka	b54cac66b7	⬆️ Update repositories Signed-off-by: GitHub <noreply@github.com>	2024-01-12 15:07:30 +00:00
Itxaka	754ac31929	Bump enki version Signed-off-by: Itxaka <itxakaserrano@gmail.com>	2024-01-12 15:43:13 +01:00
Itxaka	87c309421d	Merge pull request #108 from ci-forks/create-pull-request/patch	2024-01-12 15:42:08 +01:00
Itxaka	939857b201	Merge pull request #109 from kairos-io/renovate/github.com-onsi-ginkgo-v2-2.x	2024-01-12 15:41:42 +01:00
renovate[bot]	b82332d9bf	fix(deps): update module github.com/onsi/ginkgo/v2 to v2.14.0	2024-01-11 22:51:44 +00:00
mudler	f0cec49b08	⬆️ Update repositories Signed-off-by: GitHub <noreply@github.com>	2024-01-11 20:07:22 +00:00
Itxaka	f32d1c4baa	Merge pull request #106 from ci-forks/create-pull-request/patch	2024-01-11 10:14:40 +01:00
Itxaka	1a34dc98f2	⬆️ Update repositories Signed-off-by: GitHub <noreply@github.com>	2024-01-11 09:11:32 +00:00
Itxaka	b7af88b618	Do not hardcode enki version when building tools image Signed-off-by: Itxaka <itxakaserrano@gmail.com>	2024-01-11 10:00:16 +01:00
Itxaka	275bbf8871	Merge pull request #107 from kairos-io/efi_secureboot_enki	2024-01-11 09:39:15 +01:00
Itxaka	866dc42c48	Drop usage of system/grub2-efi package as a source Now rootfs needs to provide their artifacts from packages so the dir is no longer used, so the config needs to change The package is still there as alpine will need it as a last resort but it wont support secureboot Signed-off-by: Itxaka <itxaka@kairos.io>	2023-12-30 12:53:33 +01:00
Itxaka	e4482ddc08	Merge pull request #78 from kairos-io/renovate/github.com-onsi-ginkgo-v2-2.x	2023-12-03 13:38:41 +01:00
renovate[bot]	a946063eac	fix(deps): update module github.com/onsi/ginkgo/v2 to v2.13.2	2023-12-03 12:38:33 +00:00
Itxaka	73afbbf332	Merge pull request #97 from kairos-io/renovate/actions-checkout-4.x	2023-12-03 13:38:24 +01:00
Itxaka	17ef38753d	Merge pull request #94 from kairos-io/renovate/quay.io-luet-base-0.x	2023-12-03 13:38:09 +01:00
Itxaka	bcda489c96	Merge pull request #101 from kairos-io/renovate/github.com-onsi-gomega-1.x	2023-12-03 13:37:59 +01:00
Itxaka	e731abc99b	Merge pull request #102 from kairos-io/renovate/docker-build-push-action-5.x	2023-12-03 13:37:47 +01:00
Itxaka	1354314fd4	Merge pull request #103 from kairos-io/renovate/docker-login-action-3.x	2023-12-03 13:37:37 +01:00
Itxaka	98bb28c046	Merge pull request #92 from ci-forks/create-pull-request/patch	2023-12-03 13:37:14 +01:00
mudler	9f456b0119	⬆️ Update repositories Signed-off-by: GitHub <noreply@github.com>	2023-12-02 20:06:59 +00:00
renovate[bot]	08db23aca8	chore(deps): update quay.io/luet/base docker tag to v0.35.0	2023-11-22 07:34:00 +00:00
renovate[bot]	9a6003118e	fix(deps): update module github.com/onsi/gomega to v1.30.0	2023-11-08 18:31:24 +00:00
renovate[bot]	f67f1939b9	chore(deps): update docker/login-action action to v3	2023-10-05 22:38:45 +00:00
renovate[bot]	d744abf9ab	chore(deps): update docker/build-push-action action to v5	2023-10-05 22:38:41 +00:00
renovate[bot]	320dd7a070	chore(deps): update actions/checkout action to v4	2023-10-05 06:51:13 +00:00