Skip to content

Commit 96b0435

Browse files
author
Jenkins CI
committed
Changes from 0.16.31
1 parent 0b8cda6 commit 96b0435

File tree

6 files changed

+24
-7
lines changed

6 files changed

+24
-7
lines changed

.devcontainer/Dockerfile

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM node:20.14.0-bookworm
2-
ENV PS_VERSION=0.15.64 \
3-
URSIM_VERSION=0.13.124 \
4-
SDK_VERSION=6.0.27
2+
ENV PS_VERSION=0.16.31 \
3+
URSIM_VERSION=0.14.47 \
4+
SDK_VERSION=6.1.29
55
SHELL ["/bin/bash", "-c"]
66

77
RUN set -ex; \
@@ -13,6 +13,11 @@ RUN set -ex; \
1313
sudo \
1414
tzdata \
1515
unzip \
16+
python3 \
17+
python3-venv \
18+
python3-pip \
19+
binutils \
20+
git \
1621
rsync; \
1722
rm -rf /var/lib/apt/lists/*
1823

@@ -35,6 +40,8 @@ RUN set -ex; \
3540
# Copy zipped files to /
3641
COPY *.zip /
3742

43+
# Update NPM
44+
RUN npm -g install npm@10.9.1
3845
# Set up non-root user
3946
ARG USERNAME=dev
4047
ARG USER_UID=1001
@@ -55,4 +62,5 @@ RUN set -ex; \
5562
USER $USERNAME
5663

5764
RUN cd /ursim-polyscopex-${URSIM_VERSION}; ./install.sh
58-
RUN cd /sdk-polyscopex-${SDK_VERSION}; ./install.sh
65+
RUN cd /sdk-polyscopex-${SDK_VERSION}; ./install.sh
66+
RUN cd /sdk-polyscopex-${SDK_VERSION}; python3 -m venv urcap-generator/venv; source urcap-generator/venv/bin/activate; pip3 install -r urcap-generator/requirements.txt

.devcontainer/devcontainer.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
],
1515
"onCreateCommand": "sudo chmod 666 /var/run/docker.sock",
1616
"updateContentCommand": {
17-
"setOwnership": "sudo chown -R dev:dev ${containerWorkspaceFolder} /ursim-polyscopex-0.13.124 /sdk-polyscopex-6.0.27"
17+
"setOwnership": "sudo chown -R dev:dev ${containerWorkspaceFolder} /ursim-polyscopex-0.14.47 /sdk-polyscopex-6.1.29"
1818
},
1919
"postCreateCommand": {
20-
"prepareUrsim": "sudo rm -f run-simulator && ln -s /ursim-polyscopex-0.13.124/run-simulator ${containerWorkspaceFolder}",
21-
"prepareSdk": "sudo rsync -ac --info=progress2 --exclude=install.sh --exclude=readme.txt /sdk-polyscopex-6.0.27/ ${containerWorkspaceFolder}",
20+
"prepareUrsim": "sudo rm -f run-simulator && ln -s /ursim-polyscopex-0.14.47/run-simulator ${containerWorkspaceFolder}",
21+
"prepareSdk": "sudo rsync -ac --info=progress2 --exclude=install.sh --exclude=readme.txt /sdk-polyscopex-6.1.29/ ${containerWorkspaceFolder}",
2222
},
2323
"postStartCommand": "sudo chmod 666 /var/run/docker.sock",
2424
"containerEnv": {
@@ -32,6 +32,11 @@
3232
],
3333
"customizations": {
3434
"vscode": {
35+
"settings": {
36+
"angular.languageServer.trace": "messages",
37+
"angular.languageServer.useBundled": true,
38+
"angular.forceStrictTemplates": true
39+
},
3540
"extensions": [
3641
"Angular.ng-template",
3742
"ZainChen.json",
-4.65 KB
Binary file not shown.
4.64 KB
Binary file not shown.

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
samples/**
2+
urcap-generator/**
3+
newurcap.sh
4+
run-simulator

0 commit comments

Comments
 (0)