Skip to content

Commit 3bcaed1

Browse files
SDawleySDawley
authored
Get jupyter working. Move source tarball creation to after npm files downloaded. (#71)
1 parent e0397d4 commit 3bcaed1

File tree

19 files changed

+25
-41
lines changed

19 files changed

+25
-41
lines changed

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ RUN npm install -g ${extension_manager}
2525
RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
2626
git clone ${extension_repository} ${extension_name} && \
2727
cd ./${extension_name} && git checkout ${extension_revision} && \
28-
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
2928
npm install -g @vscode/vsce@${extension_vsce} [email protected] && \
3029
if [[ -f yarn.lock ]]; then yarn install; \
3130
else npm install --unsafe-perm=true --allow-root; fi && \
31+
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
3232
vsce package --out /${extension_name}.vsix

‎atlassian.atlascode/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ RUN npm install -g npm@latest ${extension_manager}
2525
RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
2626
git clone ${extension_repository} ${extension_name} && \
2727
cd ./${extension_name} && git checkout ${extension_revision} && \
28-
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
2928
npm install -g @vscode/vsce@${extension_vsce} [email protected] && \
3029
if [[ -f yarn.lock ]]; then yarn install; \
3130
else npm install --unsafe-perm=true --allow-root; fi && \
31+
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
3232
# Adding --no-dependencies for now since there is an npm list issue during packaging
3333
vsce package --out /${extension_name}.vsix --baseContentUrl https://bitbucket.org/atlassianlabs/atlascode/src/main/ --no-dependencies

‎bmewburn.vscode-intelephense-client/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ RUN npm install -g ${extension_manager}
2525
RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
2626
git clone ${extension_repository} ${extension_name} && \
2727
cd ./${extension_name} && git checkout ${extension_revision} && \
28-
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
2928
npm install -g @vscode/vsce@${extension_vsce} [email protected] && \
3029
if [[ -f yarn.lock ]]; then yarn install; \
3130
else npm install --unsafe-perm=true --allow-root; fi && \
31+
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
3232
vsce package --out /${extension_name}.vsix --no-dependencies

‎donjayamanne.githistory/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ RUN npm install -g ${extension_manager}
2525
RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
2626
git clone ${extension_repository} ${extension_name} && \
2727
cd ./${extension_name} && git checkout ${extension_revision} && \
28-
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
2928
npm install -g @vscode/vsce@${extension_vsce} [email protected] && \
3029
if [[ -f yarn.lock ]]; then yarn install; \
3130
else npm install --unsafe-perm=true --allow-root; fi && \
31+
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
3232
vsce package --out /${extension_name}.vsix --no-dependencies

‎felixfbecker.php-debug/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ RUN npm install -g ${extension_manager}
2525
RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
2626
git clone ${extension_repository} ${extension_name} && \
2727
cd ./${extension_name} && git checkout ${extension_revision} && \
28-
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
2928
npm install -g @vscode/vsce@${extension_vsce} [email protected] && \
3029
if [[ -f yarn.lock ]]; then yarn install; \
3130
else npm install --unsafe-perm=true --allow-root; fi && \
31+
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
3232
npm run build && \
3333
vsce package --out /${extension_name}.vsix

‎github.vscode-pull-request-github/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ RUN npm install -g ${extension_manager}
2525
RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
2626
git clone ${extension_repository} ${extension_name} && \
2727
cd ./${extension_name} && git checkout ${extension_revision} && \
28-
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
2928
npm install -g @vscode/vsce@${extension_vsce} [email protected] && \
3029
if [[ -f yarn.lock ]]; then yarn install; \
3130
else npm install --unsafe-perm=true --allow-root; fi && \
31+
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
3232
yarn run compile && \
3333
vsce package --out /${extension_name}.vsix

‎gitlab.gitlab-workflow/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ RUN npm install -g ${extension_manager}
2525
RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
2626
git clone ${extension_repository} ${extension_name} && \
2727
cd ./${extension_name} && git checkout ${extension_revision} && \
28-
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
2928
npm install -g @vscode/vsce@${extension_vsce} [email protected] && \
3029
if [[ -f yarn.lock ]]; then yarn install; \
3130
else npm install --unsafe-perm=true --allow-root; fi && \
31+
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
3232
npm run package && \
3333
mv ./dist-desktop/gitlab-workflow-*.vsix /gitlab.gitlab-workflow.vsix

‎ms-python.python/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ ENV TRAVIS=true
3030
RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
3131
git clone ${extension_repository} ${extension_name} && \
3232
cd ./${extension_name} && git checkout ${extension_revision} && \
33-
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
3433
npm install -g @vscode/vsce@${extension_vsce} [email protected] && \
3534
if [[ -f yarn.lock ]]; then yarn install; \
3635
else npm install --unsafe-perm=true --allow-root; fi && \
36+
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
3737
gulp clean && gulp prePublishBundle && \
3838
vsce package --out /${extension_name}.vsix

‎ms-toolsai.jupyter/Dockerfile

+6-22
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,15 @@ ARG extension_vsce
2020
USER root
2121
WORKDIR /
2222

23-
# Make cmake so we can make zeromq so we can install npm dependencies
24-
RUN curl -L https://github.com/Kitware/CMake/releases/download/v3.26.2/cmake-3.26.2.tar.gz -o cmake-3.26.2.tar.gz && \
25-
gunzip cmake-3.26.2.tar.gz && \
26-
tar -xvf cmake-3.26.2.tar && \
27-
cd cmake-3.26.2 && \
28-
./bootstrap && \
29-
make && \
30-
make install
31-
3223
RUN npm install -g ${extension_manager}
33-
RUN dnf -y install python38 python3-pip platform-python-pip && \
34-
ln -s /usr/bin/python3 /usr/bin/python && \
35-
python3 -m pip install --upgrade pip
3624

3725
RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
3826
git clone ${extension_repository} ${extension_name} && \
3927
cd ./${extension_name} && git checkout ${extension_revision} && \
28+
npm install -g @vscode/vsce@${extension_vsce} [email protected] --unsafe-perm=true&& \
29+
npm install --unsafe-perm=true --allow-root && \
30+
dnf module install -y nodejs:16/common && \
31+
npm install @types/vscode react-is crypto --unsafe-perm=true && \
4032
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
41-
npm install -g @vscode/vsce@${extension_vsce} [email protected] && \
42-
npm install [email protected] && \
43-
npm install --unsafe-perm=true --allow-root --ignore-scripts && \
44-
#--loglevel silly
45-
python3 -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir \
46-
--implementation py --no-deps --upgrade -r ./requirements.txt --no-user && \
47-
npm run clean && \
48-
npm run package
49-
50-
33+
#npm run package
34+
gulp clean && gulp prePublishBundle && vsce package -o /${extension_name}.vsix

‎ms-vscode.js-debug/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ RUN npm install -g ${extension_manager}
2525
RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
2626
git clone ${extension_repository} ${extension_name} && \
2727
cd ./${extension_name} && git checkout ${extension_revision} && \
28-
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
2928
npm install -g @vscode/vsce@${extension_vsce} [email protected] && \
3029
if [[ -f yarn.lock ]]; then yarn install; \
3130
else npm install --unsafe-perm=true --allow-root; fi && \
31+
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
3232
npm run package && \
3333
ls dist && \
3434
mv ./dist/js-debug.vsix /ms-vscode.js-debug.vsix

‎ms-vscode.vscode-js-profile-table/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ RUN npm install -g ${extension_manager}
2525
RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
2626
git clone ${extension_repository} ${extension_name} && \
2727
cd ./${extension_name} && git checkout ${extension_revision} && \
28-
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
2928
npm install -g @vscode/vsce@${extension_vsce} [email protected] && \
3029
if [[ -f yarn.lock ]]; then yarn install; \
3130
else npm install --unsafe-perm=true --allow-root; fi && \
31+
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
3232
npm run compile && \
3333
cd ./packages/vscode-js-profile-table && cp ../../LICENSE ./ && \
3434
vsce package --out /${extension_name}.vsix --no-dependencies

‎plugin-config.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@
9898
"ms-toolsai.jupyter": {
9999
"comment": "Cannot be built due to https://github.com/microsoft/vscode-jupyter/issues/13260, tracked in https://issues.redhat.com/browse/CRW-4325",
100100
"repository": "https://github.com/microsoft/vscode-jupyter",
101-
"revision": "2023.03.100",
101+
"revision": "4733a075e8af70d358dba81987395c9150fe5802",
102102
"update": "false",
103103
"ubi8Image": "nodejs-16:1-90",
104-
"packageManager": "npm@8.15.1"
104+
"packageManager": "npm@6.14.18"
105105
},
106106
"ms-toolsai.jupyter-keymap": {
107107
"comment": "Version: 1.1.2",

‎redhat.ansible/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ RUN npm install -g ${extension_manager}
2525
RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
2626
git clone ${extension_repository} ${extension_name} && \
2727
cd ./${extension_name} && git checkout ${extension_revision} && \
28-
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
2928
npm install -g @vscode/vsce@${extension_vsce} [email protected] && \
3029
if [[ -f yarn.lock ]]; then yarn install; \
3130
else npm install --unsafe-perm=true --allow-root; fi && \
31+
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
3232
yarn run webpack && \
3333
vsce package --out /${extension_name}.vsix

‎redhat.fabric8-analytics/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ RUN npm install -g ${extension_manager}
2525
RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
2626
git clone ${extension_repository} ${extension_name} && \
2727
cd ./${extension_name} && git checkout ${extension_revision} && \
28-
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
2928
npm install -g @vscode/vsce@${extension_vsce} [email protected] --unsafe-perm=true && \
3029
if [[ -f yarn.lock ]]; then yarn install; \
3130
else npm install --unsafe-perm=true --allow-root; fi && \
31+
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
3232
#the svg file breaks vsce so we take it out until they update the marketplace image
3333
sed -i '/fabric8-analytics.svg/d' ./README.md && \
3434
vsce package --out /${extension_name}.vsix

‎redhat.java/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
3434
cd ./${extension_name} && git checkout ${extension_revision} && \
3535
#Copy quarkus source into extension source to package both
3636
cp /eclipse.jdt.ls-${JDT_VERSION}-sources.tar.gz ./ && \
37-
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
3837
npm install -g @vscode/vsce@${extension_vsce} [email protected] && \
3938
if [[ -f yarn.lock ]]; then yarn install; \
4039
else npm install --unsafe-perm=true --allow-root; fi && \
40+
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
4141
npm run compile && \
4242
npm run vscode:prepublish && \
4343
vsce package --out /${extension_name}.vsix

‎redhat.vscode-commons/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ RUN npm install -g ${extension_manager}
2525
RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
2626
git clone ${extension_repository} ${extension_name} && \
2727
cd ./${extension_name} && git checkout ${extension_revision} && \
28-
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
2928
npm install -g @vscode/vsce@${extension_vsce} [email protected] && \
3029
if [[ -f yarn.lock ]]; then yarn install; \
3130
else npm install --unsafe-perm=true --allow-root; fi && \
31+
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
3232
#the svg file breaks vsce so we take it out until they update the marketplace image
3333
sed -i '/vscode-commons.svg/d' ./README.md && \
3434
vsce package --out /${extension_name}.vsix

‎redhat.vscode-quarkus/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
3434
cd ./${extension_name} && git checkout ${extension_revision} && \
3535
#Copy quarkus source into extension source to package both
3636
cp /quarkus-ls-${QUARKUS_VERSION}-sources.tar.gz ./ && \
37-
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
3837
npm install -g @vscode/vsce@${extension_vsce} [email protected] --unsafe-perm=true && \
3938
if [[ -f yarn.lock ]]; then yarn install; \
4039
else npm install --unsafe-perm=true --allow-root; fi && \
40+
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
4141
vsce package --out /${extension_name}.vsix

‎redhat.vscode-xml/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ RUN dnf install -y jq
2828
RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
2929
git clone ${extension_repository} ${extension_name} && \
3030
cd ./${extension_name} && git checkout ${extension_revision} && \
31-
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
3231
echo ">> REPLACE in package-lock.json" && \
3332
REPLACE_FROM="https://repository.engineering.redhat.com/nexus/repository/registry.npmjs.org" && \
3433
REPLACE_TO="https://registry.npmjs.org" && \
3534
sed -i "s|${REPLACE_FROM}|${REPLACE_TO}|" package-lock.json && \
3635
npm install -g @vscode/vsce@${extension_vsce} [email protected] && \
3736
if [[ -f yarn.lock ]]; then yarn install; \
3837
else npm install --unsafe-perm=true --allow-root; fi && \
38+
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
3939
echo ">> download XML server" && \
4040
export XML_SERVER_VERSION="$(cat package.json | jq -r .xmlServer.version)" && \
4141
mkdir ./server && cd ./server && \

‎xdebug.php-debug/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ RUN npm install -g ${extension_manager}
2525
RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
2626
git clone ${extension_repository} ${extension_name} && \
2727
cd ./${extension_name} && git checkout ${extension_revision} && \
28-
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
2928
npm install -g @vscode/vsce@${extension_vsce} [email protected] && \
3029
if [[ -f yarn.lock ]]; then yarn install; \
3130
else npm install --unsafe-perm=true --allow-root; fi && \
31+
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
3232
npm run build && \
3333
vsce package --out /${extension_name}.vsix ${extension_revision}

0 commit comments

Comments
 (0)