Skip to content

Commit

Permalink
Merge branch 'master' into test_failing_jobs
Browse files Browse the repository at this point in the history
Signed-off-by: Itxaka <[email protected]>
  • Loading branch information
Itxaka authored Aug 2, 2023
2 parents 5fce21e + 19f3c7a commit ad30d4b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
5 changes: 3 additions & 2 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ARG OS_LABEL=latest
# renovate: datasource=docker depName=quay.io/luet/base
ARG LUET_VERSION=0.34.0
# renovate: datasource=docker depName=aquasec/trivy
ARG TRIVY_VERSION=0.42.0
ARG TRIVY_VERSION=0.44.0
ARG COSIGN_SKIP=".*quay.io/kairos/.*"
# TODO: rename ISO_NAME to something like ARTIFACT_NAME because there are place where we use ISO_NAME to refer to the artifact name

Expand All @@ -26,7 +26,7 @@ END
ARG COSIGN_EXPERIMENTAL=0
ARG CGO_ENABLED=0
# renovate: datasource=docker depName=quay.io/kairos/osbuilder-tools versioning=semver-coerced
ARG OSBUILDER_VERSION=v0.8.0
ARG OSBUILDER_VERSION=v0.8.2
ARG OSBUILDER_IMAGE=quay.io/kairos/osbuilder-tools:$OSBUILDER_VERSION
ARG GOLINT_VERSION=1.52.2
# renovate: datasource=docker depName=golang
Expand Down Expand Up @@ -278,6 +278,7 @@ base-image:
ARG VARIANT
ARG KAIROS_VERSION
ARG BUILD_INITRD="true"
ARG TARGETARCH
IF [ "$BASE_IMAGE" = "" ]
# Source the flavor-provided docker file
IF [[ "$FLAVOR" =~ ^ubuntu* ]] && [ "$TARGETARCH" != "arm64" ]
Expand Down
2 changes: 1 addition & 1 deletion earthly.ps1
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.13 --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.14 --allow-privileged @args
2 changes: 1 addition & 1 deletion earthly.sh
Original file line number Diff line number Diff line change
@@ -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.13 --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.14 --allow-privileged "$@"
4 changes: 2 additions & 2 deletions framework-profile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,9 @@ repositories:
priority: 2
urls:
- "quay.io/kairos/packages"
reference: 20230801113906-repository.yaml
reference: 20230801144448-repository.yaml
- !!merge <<: *kairos
arch: arm64
urls:
- "quay.io/kairos/packages-arm64"
reference: 20230801120136-repository.yaml
reference: 20230801144008-repository.yaml

0 comments on commit ad30d4b

Please sign in to comment.