Skip to content

Commit f9275bb

Browse files
authored
chore: update dockerfile and bump kpm pkg version (#1384)
1 parent d17c05b commit f9275bb

File tree

4 files changed

+19
-7
lines changed

4 files changed

+19
-7
lines changed

.github/workflows/release.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,19 @@ jobs:
5757
uses: actions/setup-go@v2
5858
with:
5959
go-version: 1.22
60+
- name: Set up Node.js
61+
uses: actions/setup-node@v2
62+
with:
63+
node-version: '18'
64+
- name: Install npm packages and build UI
65+
working-directory: ./ui
66+
run: |
67+
npm install
68+
# Using 'CI=false' prevents build errors due to warnings.
69+
# It bypasses the 'process.env.CI = true' setting in CI environments
70+
# that treats warnings as errors, ensuring a successful build.
71+
CI=false npm run build
72+
touch build/.gitkeep
6073
# Get version information
6174
- name: Get version
6275
id: get_version

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ COPY --from=portal-builder /src/ui/build /src/ui/build
1111
WORKDIR /src
1212
RUN --mount=type=cache,target=/go/pkg --mount=type=cache,target=/root/.cache/go-build SKIP_BUILD_PORTAL=true make build-local-linux
1313

14-
FROM ubuntu:22.04 AS base
14+
FROM --platform=linux/amd64 ubuntu:22.04 AS base
1515
# Install KCL Dependencies
16-
RUN apt-get update -y && apt-get install python3 python3-pip -y
16+
RUN apt-get update -y && apt-get install python3 python3-pip git -y
1717
# KCL PATH
1818
ENV PATH="/root/go/bin:${PATH}"
1919
# KUSION
@@ -26,5 +26,4 @@ RUN /usr/local/bin/kusion
2626

2727
FROM base
2828
COPY --from=build /src/_build/bundles/kusion-linux/bin/kusion /usr/local/bin/kusion
29-
COPY --from=build /src/ui/build /usr/local/bin/ui/build
30-
RUN /usr/local/bin/kusion
29+
RUN /usr/local/bin/kusion

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ require (
8686
k8s.io/utils v0.0.0-20240821151609-f90d01438635
8787
kcl-lang.io/kcl-go v0.10.0-alpha.3
8888
kcl-lang.io/kcl-plugin v0.5.0
89-
kcl-lang.io/kpm v0.9.5
89+
kcl-lang.io/kpm v0.9.9
9090
kusionstack.io/kube-api v0.3.1
9191
kusionstack.io/kusion-api-go v0.13.0
9292
kusionstack.io/kusion-module-framework v0.2.3-beta.9

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1829,8 +1829,8 @@ kcl-lang.io/kcl-go v0.10.0-alpha.3 h1:01grUuyy/XfBZDRoMqUesU6OdzVPk0WF9WDOvuY70Z
18291829
kcl-lang.io/kcl-go v0.10.0-alpha.3/go.mod h1:kfHDBqsLNT+9T6VorS/EVbriZzix1rjIq0w6WCJ7GbA=
18301830
kcl-lang.io/kcl-plugin v0.5.0 h1:eoh6y4l81rwA8yhJXU4hN7YmJeTUNB1nfYCP9OffSxc=
18311831
kcl-lang.io/kcl-plugin v0.5.0/go.mod h1:QnZ5OLcyBw5nOnHpChRHtvBq8wvjwiHu/ZZ8j1dfz48=
1832-
kcl-lang.io/kpm v0.9.5 h1:BvSVj1U2mqWJIpciCK7Wg1mV1hhkeE5xPqcBaOxURh4=
1833-
kcl-lang.io/kpm v0.9.5/go.mod h1:4HTbPhB4DVtkamnIv5lrRcHtCVwzp4Pf/b+d3TN4nzs=
1832+
kcl-lang.io/kpm v0.9.9 h1:87A+Mp9pKtdLz6qtngdmDjkpTg9I4MIGJ93rtzjRTlk=
1833+
kcl-lang.io/kpm v0.9.9/go.mod h1:4HTbPhB4DVtkamnIv5lrRcHtCVwzp4Pf/b+d3TN4nzs=
18341834
kcl-lang.io/lib v0.10.0-alpha.3 h1:tZ7du+9/wv5ZHyPmPxljZQ33DdTYw++d9joH0LMC3q8=
18351835
kcl-lang.io/lib v0.10.0-alpha.3/go.mod h1:tu+tzwGgHLzYZSIxUG/ntipStrxZd6OvutWYPTxS7cs=
18361836
kusionstack.io/kube-api v0.3.1 h1:MqU41B0i2cofm2M5KQIkuTsWQ81p0Ueq93zbdUaOuCM=

0 commit comments

Comments
 (0)