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.

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

Jump to bottom

@uppy/companion: don't pin Yarn version in package.json #3347

Merged
merged 2 commits into from Dec 9, 2021
Merged

@uppy/companion: don't pin Yarn version in package.json #3347

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f84592e
@uppy/companion: use npm when building in Dockerfile
aduh95 Dec 7, 2021
9581ad7
Rollback changes in Dockerfile
aduh95 Dec 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions bin/update-yarn.sh
View file
Open in desktop
Expand Up @@ -28,8 +28,6 @@ echo "$PLUGINS" | xargs -n1 -t corepack yarn plugin remove

cp package.json .yarn/cache/tmp.package.json
sed "s#\"yarn\": \"$CURRENT_VERSION\"#\"yarn\": \"$LAST_VERSION\"#;s#\"yarn@$CURRENT_VERSION\"#\"yarn@$LAST_VERSION\"#" .yarn/cache/tmp.package.json > package.json
cp packages/@uppy/companion/package.json .yarn/cache/tmp.package.json
sed "s#\"yarn\": \"$CURRENT_VERSION\"#\"yarn\": \"$LAST_VERSION\"#;s#\"yarn@$CURRENT_VERSION\"#\"yarn@$LAST_VERSION\"#" .yarn/cache/tmp.package.json > packages/@uppy/companion/package.json
rm .yarn/cache/tmp.package.json

echo "$PLUGINS" | xargs -n1 -t corepack yarn plugin import
Expand Down
4 changes: 2 additions & 2 deletions packages/@uppy/companion/Dockerfile
View file
Open in desktop
Expand Up @@ -9,13 +9,13 @@ WORKDIR /app
ADD package.json package-*.json yarn.* /tmp/
RUN cd /tmp && apk --update add --virtual native-dep \
make gcc g++ python3 libgcc libstdc++ git && \
corepack yarn install && \
npm install && \
aduh95 marked this conversation as resolved.
Show resolved Hide resolved
apk del native-dep
RUN mkdir -p /app && cd /app && ln -nfs /tmp/node_modules
RUN apk add bash
COPY . /app
ENV PATH "${PATH}:/app/node_modules/.bin"
RUN corepack yarn run build
RUN npm run build
aduh95 marked this conversation as resolved.
Show resolved Hide resolved

FROM node:16.13.0-alpine

Expand Down
4 changes: 1 addition & 3 deletions packages/@uppy/companion/package.json
View file
Open in desktop
Expand Up @@ -112,9 +112,7 @@
"test": "bash -c 'source env.test.sh && ../../../node_modules/jest/bin/jest.js'",
"test:watch": "yarn test -- --watch"
},
"packageManager": "yarn@3.1.0",
"engines": {
"node": ">=10.20.1",
"yarn": "3.1.0"
"node": ">=10.20.1"
}
}