Skip to content

Commit 2bcac49

Browse files
committed
ci: fix build
1 parent 5bfbc9c commit 2bcac49

File tree

2 files changed

+21
-17
lines changed

2 files changed

+21
-17
lines changed

build/Containerfile

+17-13
Original file line numberDiff line numberDiff line change
@@ -17,33 +17,37 @@
1717

1818
FROM ghcr.io/minc-org/minc-extension-builder:next AS builder
1919

20-
WORKDIR /opt/app-root/extension/
20+
WORKDIR /opt/app-root/extension-source
2121

2222
# copy source code
23-
COPY *.js /opt/app-root/extension/
24-
COPY *.png /opt/app-root/extension/
25-
COPY .gitignore /opt/app-root/extension/
26-
COPY *.json /opt/app-root/extension/
27-
COPY src /opt/app-root/extension/src
28-
COPY types /opt/app-root/extension/types
23+
COPY *.js /opt/app-root/extension-source/
24+
COPY *.png /opt/app-root/extension-source/
25+
COPY .gitignore /opt/app-root/extension-source/
26+
COPY *.json /opt/app-root/extension-source/
27+
COPY src /opt/app-root/extension-source/src
28+
COPY types /opt/app-root/extension-source/types
2929

3030
# refresh dependencies (if needed)
3131
RUN pnpm --frozen-lockfile install
3232
# build the extension
3333
RUN pnpm build
3434

3535
# copy output of the build + required files
36-
COPY package.json /extension/
37-
COPY LICENSE /extension/
38-
COPY *.png /extension/
39-
COPY README.md /extension/
40-
COPY dist /extension/dist
36+
RUN mkdir /opt/app-root/extension && \
37+
cp -r dist /opt/app-root/extension/ && \
38+
cp package.json /opt/app-root/extension/ && \
39+
cp *.png /opt/app-root/extension/
4140

41+
COPY package.json /opt/app-root/extension/
42+
COPY LICENSE /opt/app-root/extension/
43+
COPY README.md /opt/app-root/extension/
44+
45+
# Copy the extension to a new image
4246
FROM scratch
4347

4448
LABEL org.opencontainers.image.title="Minc extension" \
4549
org.opencontainers.image.description="Minc extension" \
4650
org.opencontainers.image.vendor="podman-desktop" \
4751
io.podman-desktop.api.version=">= 1.17.0"
4852

49-
COPY --from=builder /extension /extension
53+
COPY --from=builder /opt/app-root/extension /extension

build/Containerfile.builder

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ FROM registry.access.redhat.com/ubi9/nodejs-22-minimal:9.5-1741873206
2020
ENV HOME=/opt/app-root
2121

2222
# copy the application files to the /opt/app-root/extension directory
23-
WORKDIR /opt/app-root/extension
24-
RUN mkdir -p /opt/app-root/extension
25-
COPY package.json /opt/app-root/extension/
26-
COPY pnpm-lock.yaml /opt/app-root/extension/
23+
WORKDIR /opt/app-root/extension-source
24+
RUN mkdir -p /opt/app-root/extension-source
25+
COPY package.json /opt/app-root/extension-source/
26+
COPY pnpm-lock.yaml /opt/app-root/extension-source/
2727

2828
RUN npm install --global pnpm@10
2929
RUN pnpm --frozen-lockfile install

0 commit comments

Comments
 (0)