Skip to content

Commit 0d6f952

Browse files
committed
feat: Add GIT_REVISION argument and update profile definition script to include git revision in ISO version
1 parent 3486a41 commit 0d6f952

4 files changed

Lines changed: 7 additions & 1 deletion

File tree

alteriso/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ RUN CGO_ENABLED=0 GOOS=linux go build \
2929
# Final stage
3030
FROM archiso AS alteriso
3131

32+
ARG GIT_REVISION
33+
ENV GIT_REVISION=${GIT_REVISION}
34+
3235
COPY --from=builder /build/alteriso /usr/local/bin/alteriso
3336
COPY ./configs /usr/share/alteriso/configs
3437
COPY ./modules /usr/share/alteriso/modules

alteriso/compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ services:
33
build:
44
context: .
55
dockerfile: Dockerfile
6+
args:
7+
- GIT_REVISION
68
privileged: true
79
working_dir: /app
810
volumes:

alteriso/configs/xfce/profiledef.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ file_permissions=(
2424
["/usr/local/bin/livecd-sound"]="0:0:755"
2525
)
2626

27-
git_revision="$(git rev-parse --short HEAD 2>/dev/null || true)"
27+
git_revision=${GIT_REVISION-"$(git rev-parse --short HEAD 2>/dev/null || true)"}
2828
if [[ -n "$git_revision" ]]; then
2929
iso_version+="-$git_revision"
3030
fi

alteriso/src/internal/cmd/profile/build.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ func getProfileFromArg(cmd *cobra.Command, configDir string) (*archiso.Profile,
2828
}
2929

3030
func buildCmd() *cobra.Command {
31+
// TODO: キャッシュディレクトリを引数で指定可能にする
3132
outDir := "./out"
3233
workDir := "./work"
3334
cmd := cobra.Command{

0 commit comments

Comments
 (0)