Skip to content

Commit 66e9e7a

Browse files
committed
Merge branch 'migrate-enki'
2 parents 196c84d + b9f6893 commit 66e9e7a

File tree

23 files changed

+6
-3458
lines changed

23 files changed

+6
-3458
lines changed

.github/workflows/enki.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

.github/workflows/tool-image.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,5 @@ jobs:
6464
platforms: linux/amd64,linux/arm64
6565
push: true
6666
tags: ${{ steps.prep.outputs.tags }}
67+
build-args: |
68+
ENKI_VERSION=v0.0.2

tools-image/Dockerfile

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
11
# https://quay.io/repository/kairos/packages?tab=tags&tag=latest
22
ARG LEAP_VERSION=15.5
33
ARG LUET_VERSION=0.34.0
4-
FROM quay.io/luet/base:$LUET_VERSION AS luet
4+
ARG ENKI_VERSION=v0.0.2
55

6-
FROM golang:1.20 as enki
7-
ENV CGO_ENABLED=0
8-
COPY ./enki /src/enki
9-
WORKDIR /src/enki
10-
RUN go mod download
11-
# Set arg/env after go mod download, otherwise we invalidate the cached layers due to the commit changing easily
12-
ARG ENKI_VERSION=0.0.1
13-
ARG ENKI_COMMIT=""
14-
ENV ENKI_VERSION=${ENKI_VERSION}
15-
ENV ENKI_COMMIT=${ENKI_COMMIT}
16-
RUN go build \
17-
-ldflags "-w -s \
18-
-X github.com/kairos-io/enki/internal/version.version=$ENKI_VERSION \
19-
-X github.com/kairos-io/enki/internal/version.gitCommit=$ENKI_COMMIT" \
20-
-o /usr/bin/enki
6+
FROM quay.io/luet/base:$LUET_VERSION AS luet
7+
FROM quay.io/kairos/enki:${ENKI_VERSION} as enki
218

229
FROM opensuse/leap:$LEAP_VERSION as default
2310
RUN zypper ref && zypper dup -y
@@ -112,6 +99,6 @@ COPY ./netboot.sh /netboot.sh
11299

113100
COPY defaults.yaml /defaults.yaml
114101

115-
COPY --from=enki /usr/bin/enki /usr/bin/enki
102+
COPY --from=enki /enki /usr/bin/enki
116103

117104
ENTRYPOINT [ "/entrypoint.sh" ]

tools-image/enki/Earthfile

Lines changed: 0 additions & 19 deletions
This file was deleted.

tools-image/enki/cmd/build-iso.go

Lines changed: 0 additions & 122 deletions
This file was deleted.

tools-image/enki/cmd/build-iso_test.go

Lines changed: 0 additions & 70 deletions
This file was deleted.

tools-image/enki/cmd/cmd_suite_test.go

Lines changed: 0 additions & 29 deletions
This file was deleted.

tools-image/enki/cmd/command_test.go

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)