Merge branch 'master' into uki_iso_v2

kairos-io · Sep 26, 2023 · 6025844 · 6025844
2 parents a0d6141 + d6d6836
commit 6025844
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/Earthfile b/Earthfile
@@ -278,9 +278,6 @@ framework:
         COPY ./images/bootargs.cfg /framework/etc/cos/bootargs.cfg
         IF [[ "$FLAVOR" =~ -rpi$ ]]
             COPY ./images/rpi/config.txt /framework/boot/config.txt
-        ELSE IF [[ "$FLAVOR" =~ ^fips-systemd* ]]
-            # Use a generic one like redhat which has selinux disabled so it can be used on all flavors??
-            COPY ./images/redhat/bootargs.cfg /framework/etc/cos/bootargs.cfg
         END
     END
 

diff --git a/earthly.ps1 b/earthly.ps1
@@ -1 +1 @@
-docker run --privileged -v /var/run/docker.sock:/var/run/docker.sock --rm -t -v ${pwd}:/workspace -v earthly-tmp:/tmp/earthly:rw earthly/earthly:v0.7.17 --allow-privileged @args
+docker run --privileged -v /var/run/docker.sock:/var/run/docker.sock --rm -t -v ${pwd}:/workspace -v earthly-tmp:/tmp/earthly:rw earthly/earthly:v0.7.19 --allow-privileged @args
diff --git a/earthly.sh b/earthly.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --privileged -v /var/run/docker.sock:/var/run/docker.sock --rm --env EARTHLY_BUILD_ARGS -t -v "$(pwd)":/workspace -v earthly-tmp:/tmp/earthly:rw earthly/earthly:v0.7.17 --allow-privileged "$@"
+docker run --privileged -v /var/run/docker.sock:/var/run/docker.sock --rm --env EARTHLY_BUILD_ARGS -t -v "$(pwd)":/workspace -v earthly-tmp:/tmp/earthly:rw earthly/earthly:v0.7.19 --allow-privileged "$@"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		docker run --privileged -v /var/run/docker.sock:/var/run/docker.sock --rm -t -v ${pwd}:/workspace -v earthly-tmp:/tmp/earthly:rw earthly/earthly:v0.7.17 --allow-privileged @args
		docker run --privileged -v /var/run/docker.sock:/var/run/docker.sock --rm -t -v ${pwd}:/workspace -v earthly-tmp:/tmp/earthly:rw earthly/earthly:v0.7.19 --allow-privileged @args