Skip to content

OU-1260: [release-4.16] feat: use npm instead of yarn #813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jgbernalp wants to merge 1 commit into
base: release-4.16
Choose a base branch
from
+13,758 −6,849
Open

OU-1260: [release-4.16] feat: use npm instead of yarn #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@ FROM registry.redhat.io/ubi8/nodejs-18:1-71.1698060565 AS builder

WORKDIR /usr/src/app

RUN npm install --global yarn

ENV HUSKY=0

COPY package.json yarn.lock .
RUN yarn
COPY package.json package-lock.json .
RUN npm ci

COPY ./console-extensions.json ./tsconfig.json ./webpack.config.ts .
COPY ./locales ./locales
COPY ./src ./src
RUN yarn build
RUN npm run build

FROM registry.ci.openshift.org/ocp/4.17:base-rhel9

Expand Down
13 changes: 2 additions & 11 deletions Dockerfile.art
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,14 @@ COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR
COPY . /usr/src/app
WORKDIR /usr/src/app

# bootstrap yarn so we can install and run the other tools.
USER 0
ARG YARN_VERSION=v1.22.19
RUN CACHED_YARN=./artifacts/yarn-${YARN_VERSION}.tar.gz; \
if [ -f ${CACHED_YARN} ]; then \
npm install -g ${CACHED_YARN}; \
else \
echo "need yarn at ${CACHED_YARN}"; \
exit 1; \
fi

# use dependencies provided by Cachito
ENV HUSKY=0
RUN test -d ${REMOTE_SOURCES_DIR}/cachito-gomod-with-deps || exit 1; \
cp -f $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app/{.npmrc,.yarnrc,yarn.lock,registry-ca.pem} . \
cp -f $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app/{.npmrc,package-lock.json,registry-ca.pem} . \
&& source ${REMOTE_SOURCES_DIR}/cachito-gomod-with-deps/cachito.env \
&& yarn && yarn build
&& npm ci && npm run build

FROM registry.ci.openshift.org/ocp/4.16:base-rhel9

Expand Down
10 changes: 6 additions & 4 deletions Dockerfile.cypress
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ FROM cypress/included:12.3.0

WORKDIR /usr/src/app

COPY package.json yarn.lock .
RUN yarn install --frozen-lockfile
ENV HUSKY=0

COPY package.json package-lock.json .
RUN npm ci

COPY console-extensions.json cypress.config.ts tsconfig.json webpack.config.ts .
COPY cypress/ ./cypress
COPY locales/ ./locales
COPY src/ ./src
RUN yarn build
RUN npm run build

ENTRYPOINT ["yarn", "cypress:run:ci"]
ENTRYPOINT ["npm", "run", "cypress:run:ci"]
8 changes: 3 additions & 5 deletions Dockerfile.local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@ FROM registry.redhat.io/ubi8/nodejs-18:1-71.1698060565 AS builder

WORKDIR /usr/src/app

RUN npm install --global yarn

ENV HUSKY=0

COPY package.json yarn.lock .
RUN yarn
COPY package.json package-lock.json .
RUN npm ci

COPY ./console-extensions.json ./tsconfig.json ./webpack.config.ts .
COPY ./locales ./locales
COPY ./src ./src
RUN yarn build
RUN npm run build

FROM registry.redhat.io/ubi8/nginx-120:1-84.1675799502

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ FROM registry.redhat.io/rhel8/nodejs-18:1-71.1698060565

WORKDIR /usr/src/app

RUN npm install --global yarn
ENV HUSKY=0

COPY package.json yarn.lock .
RUN yarn
COPY package.json package-lock.json .
RUN npm ci

COPY . .

ENTRYPOINT ["yarn", "lint"]
ENTRYPOINT ["npm", "run", "lint"]
Loading