Skip to content
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.

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

Update Yarn, Node and dependencies #1145

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ plugins
coverage
dist-types
examples
docker/Dockerfile
docker/prow.Dockerfile
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:

- name: Install Dependencies
run: |
yarn install --frozen-lockfile
yarn install --immutable

- name: Prettier
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/techdocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

- name: Install Dependencies
run: |
yarn install --frozen-lockfile
yarn install --immutable

- name: Lint
run: |
Expand All @@ -52,7 +52,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: '3.10'

- name: Install techdocs-cli
run: sudo npm install -g @techdocs/cli
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.19.0
20.12.0
14 changes: 7 additions & 7 deletions .rhdh/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
# 4. add Brew metadata

# Stage 1 - Build nodejs skeleton
#@follow_tag(registry.access.redhat.com/ubi9/nodejs-18:1)
FROM registry.access.redhat.com/ubi9/nodejs-18:1-98 AS build
#@follow_tag(registry.access.redhat.com/ubi9/nodejs-20:1)
FROM registry.access.redhat.com/ubi9/nodejs-20:1-34 AS build
# hadolint ignore=DL3002
USER 0

Expand All @@ -38,7 +38,7 @@ ENV EXTERNAL_SOURCE_NESTED=$EXTERNAL_SOURCE/distgit/containers/rhdh-hub
ENV CONTAINER_SOURCE=$REMOTE_SOURCES_DIR

# Env vars
ENV YARN=$CONTAINER_SOURCE/.yarn/releases/yarn-1.22.19.cjs
ENV YARN=$CONTAINER_SOURCE/.yarn/releases/yarn-4.1.1.cjs

WORKDIR $CONTAINER_SOURCE/
COPY $EXTERNAL_SOURCE_NESTED/.yarn ./.yarn
Expand Down Expand Up @@ -111,7 +111,7 @@ RUN \
# cat $CONTAINER_SOURCE/.npmrc || true; \
# $YARN config list --verbose; npm config list; npm config list -l

RUN $YARN install --frozen-lockfile --network-timeout 600000
RUN $YARN install --immutable

# Stage 3 - Build packages
COPY $EXTERNAL_SOURCE_NESTED ./
Expand Down Expand Up @@ -165,11 +165,11 @@ RUN tar xzf $TARBALL_PATH/skeleton.tar.gz; tar xzf $TARBALL_PATH/bundle.tar.gz;

# Install production dependencies
# hadolint ignore=DL3059
RUN $YARN install --frozen-lockfile --production --network-timeout 600000
RUN $YARN workspaces focus --production

# Stage 5 - Build the runner image
#@follow_tag(registry.access.redhat.com/ubi9/nodejs-18-minimal:1)
FROM registry.access.redhat.com/ubi9/nodejs-18-minimal:1-103 AS runner
#@follow_tag(registry.access.redhat.com/ubi9/nodejs-20-minimal:1)
FROM registry.access.redhat.com/ubi9/nodejs-20-minimal:1-37 AS runner
USER 0

ENV CONTAINER_SOURCE=/opt/app-root/src
Expand Down
Loading