Skip to content

Commit ac2bea4

Browse files
Chibuzor-NwemambuHjaf
authored andcommitted
fix script in dockerfiles
1 parent a08412f commit ac2bea4

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

DockerfileColorPaletteGenerator

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,18 @@ COPY --chown="$USER":"$USER" packages/eds-utils/package.json ./packages/eds-util
4949
RUN pnpm install --prod --frozen-lockfile
5050

5151
# Copy built files
52+
<<<<<<< HEAD
5253
COPY --chown="$USER":"$USER" --from=build /apps/eds-color-palette-generator/.next ./apps/eds-color-palette-generator/.next
5354
COPY --chown="$USER":"$USER" --from=build /apps/eds-color-palette-generator/public ./apps/eds-color-palette-generator/public
5455
COPY --chown="$USER":"$USER" --from=build /packages/eds-tokens/dist ./packages/eds-tokens/dist
5556
COPY --chown="$USER":"$USER" --from=build /packages/eds-tailwind/dist ./packages/eds-tailwind/dist
5657
COPY --chown="$USER":"$USER" --from=build /packages/eds-utils/dist ./packages/eds-utils/dist
58+
=======
59+
COPY --chown="$USER":"$USER" --from=build /app/apps/eds-color-palette-generator/.next ./apps/eds-color-palette-generator/.next
60+
COPY --chown="$USER":"$USER" --from=build /app/packages/eds-tokens/dist ./packages/eds-tokens/dist
61+
COPY --chown="$USER":"$USER" --from=build /app/packages/eds-tailwind/dist ./packages/eds-tailwind/dist
62+
COPY --chown="$USER":"$USER" --from=build /app/packages/eds-utils/dist ./packages/eds-utils/dist
63+
>>>>>>> 93cdd4c2 (fix script in dockerfiles)
5764

5865
USER "$UID"
5966

DockerfileEdsDemo

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@ COPY . ./
1616
# Install dependencies first
1717
RUN pnpm install --frozen-lockfile
1818

19-
# Build workspace dependencies in correct order, then build the app
19+
# Build only required workspace dependencies, then build the app
2020
RUN pnpm --filter @equinor/eds-tokens-sync run build && \
2121
pnpm --filter @equinor/eds-tokens-build run build && \
2222
pnpm --filter @equinor/eds-tokens run build && \
23-
pnpm --filter @equinor/eds-utils run build && \
24-
pnpm --filter @equinor/eds-icons run build && \
2523
pnpm --filter @equinor/eds-core-react run build && \
2624
pnpm --filter eds-demo run build
2725

@@ -50,10 +48,9 @@ COPY --chown="$USER":"$USER" packages/eds-core-react/package.json ./packages/eds
5048
RUN pnpm install --prod --frozen-lockfile
5149

5250
# Copy built files
53-
COPY --chown="$USER":"$USER" --from=build /apps/eds-demo/.next ./apps/eds-demo/.next
54-
COPY --chown="$USER":"$USER" --from=build /apps/eds-demo/public ./apps/eds-demo/public
55-
COPY --chown="$USER":"$USER" --from=build /packages/eds-tokens/dist ./packages/eds-tokens/dist
56-
COPY --chown="$USER":"$USER" --from=build /packages/eds-core-react/dist ./packages/eds-core-react/dist
51+
COPY --chown="$USER":"$USER" --from=build /app/apps/eds-demo/.next ./apps/eds-demo/.next
52+
COPY --chown="$USER":"$USER" --from=build /app/packages/eds-tokens/dist ./packages/eds-tokens/dist
53+
COPY --chown="$USER":"$USER" --from=build /app/packages/eds-core-react/dist ./packages/eds-core-react/dist
5754

5855
USER "$UID"
5956

0 commit comments

Comments
 (0)