Skip to content

Commit

Permalink
Merge pull request torizon#170 from andreriesco/release-2.4.1
Browse files Browse the repository at this point in the history 
Update the SSH copy to COPY inside the container on the remaining templates
  • Loading branch information
@microhobby
microhobby authored Feb 7, 2024
2 parents ca63ecb + 3dd513c commit 7f52790
Show file tree
Hide file tree
Showing 55 changed files with 548 additions and 766 deletions.
1 change: 0 additions & 1 deletion cppQML/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ ARG BASE_VERSION=3

##
# Board architecture
# arm or arm64
##
ARG IMAGE_ARCH=

Expand Down
6 changes: 2 additions & 4 deletions cppQML/Dockerfile.debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
##
ARG IMAGE_ARCH=



##
# Base container version
##
Expand Down Expand Up @@ -131,8 +129,8 @@ RUN mkdir /var/run/sshd && \
RUN rm -r /etc/ssh/ssh*key && \
dpkg-reconfigure openssh-server

# Copy the compiled application to the $APP_ROOT directory path inside the
# container, where $APP_ROOT is the torizon_app_root configuration defined
# Copy the compiled application to the $APP_ROOT directory path inside the
# container, where $APP_ROOT is the torizon_app_root configuration defined
# in settings.json.
COPY --chown=$SSHUSERNAME:$SSHUSERNAME ./build-${IMAGE_ARCH}/bin ${APP_ROOT}

Expand Down
2 changes: 0 additions & 2 deletions cppQML/Dockerfile.sdk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
##
ARG IMAGE_ARCH=



##
# Base container version
##
Expand Down
1 change: 1 addition & 0 deletions cppSlint/.dockerignore
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
credentials.zip
build/*/CMakeFiles
21 changes: 9 additions & 12 deletions cppSlint/.vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,14 @@
"name": "Torizon AMD64",
"type": "cppdbg",
"request": "launch",
"program": "~/app/__change__",
"program": "${config:torizon_app_root}/__change__",
"args": [],
"stopAtEntry": false,
"cwd": "~/app",
"cwd": "${config:torizon_app_root}",
"environment": [],
"externalConsole": false,
"sourceFileMap": {
"/home/torizon/app": "${workspaceFolder}/build/amd64",
"/app": "${workspaceFolder}"
"${config:torizon_app_root}": "${workspaceFolder}"
},
"pipeTransport": {
"debuggerPath": "/usr/bin/gdb",
Expand Down Expand Up @@ -76,17 +75,16 @@
"name": "Torizon ARMv8",
"type": "cppdbg",
"request": "launch",
"program": "~/app/__change__",
"program": "${config:torizon_app_root}/__change__",
"args": [
],
"stopAtEntry": false,
"cwd": "~/app",
"cwd": "${config:torizon_app_root}",
"environment": [
],
"externalConsole": false,
"sourceFileMap": {
"/home/torizon/app": "${workspaceFolder}/build/arm64",
"/app": "${workspaceFolder}"
"${config:torizon_app_root}": "${workspaceFolder}"
},
"pipeTransport": {
"debuggerPath": "/usr/bin/gdb",
Expand Down Expand Up @@ -124,15 +122,14 @@
"name": "Torizon ARMv7",
"type": "cppdbg",
"request": "launch",
"program": "~/app/__change__",
"program": "${config:torizon_app_root}/__change__",
"args": [],
"stopAtEntry": false,
"cwd": "~/app",
"cwd": "${config:torizon_app_root}",
"environment": [],
"externalConsole": false,
"sourceFileMap": {
"/home/torizon/app": "${workspaceFolder}/build/armhf",
"/app": "${workspaceFolder}"
"${config:torizon_app_root}": "${workspaceFolder}"
},
"pipeTransport": {
"debuggerPath": "/usr/bin/gdb",
Expand Down
2 changes: 1 addition & 1 deletion cppSlint/.vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"torizon_arch": "",
"wait_sync": "1",
"torizon_run_as": "torizon",
"torizon_app_root": "/home/torizon",
"torizon_app_root": "/home/torizon/app",
"tcb.packageName": "__change__",
"tcb.version": "3.8.1"
}
82 changes: 23 additions & 59 deletions cppSlint/.vscode/tasks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"-o",
"StrictHostKeyChecking=no",
"${config:torizon_run_as}@${config:torizon_ip}",
"cd ~/app && gdbserver localhost:${config:torizon_debug_port2} __change__"
"cd ${config:torizon_app_root} && gdbserver localhost:${config:torizon_debug_port2} __change__"
],
"dependsOrder": "sequence",
"dependsOn": [
Expand Down Expand Up @@ -64,7 +64,7 @@
"-o",
"StrictHostKeyChecking=no",
"${config:torizon_run_as}@${config:torizon_ip}",
"cd ~/app && gdbserver localhost:${config:torizon_debug_port2} __change__"
"cd ${config:torizon_app_root} && gdbserver localhost:${config:torizon_debug_port2} __change__"
],
"dependsOrder": "sequence",
"dependsOn": [
Expand All @@ -91,7 +91,7 @@
"-o",
"StrictHostKeyChecking=no",
"${config:torizon_run_as}@${config:torizon_ip}",
"cd ~/app && gdbserver localhost:${config:torizon_debug_port2} __change__"
"cd ${config:torizon_app_root} && gdbserver localhost:${config:torizon_debug_port2} __change__"
],
"dependsOrder": "sequence",
"dependsOn": [
Expand All @@ -110,9 +110,9 @@
"type": "shell",
"args": [
"-DCMAKE_BUILD_TYPE=Debug",
"-B",
"-B",
"build/x86_64",
"-S",
"-S",
"."
],
"problemMatcher": [
Expand Down Expand Up @@ -175,7 +175,7 @@
"run",
"--rm",
"-v",
"${workspaceFolder}:/app",
"${workspaceFolder}:${config:torizon_app_root}",
"cross-toolchain-arm64-__container__",
"bash",
"-c",
Expand Down Expand Up @@ -203,7 +203,7 @@
"run",
"--rm",
"-v",
"${workspaceFolder}:/app",
"${workspaceFolder}:${config:torizon_app_root}",
"cross-toolchain-arm64-__container__",
"bash",
"-c",
Expand Down Expand Up @@ -231,7 +231,7 @@
"run",
"--rm",
"-v",
"${workspaceFolder}:/app",
"${workspaceFolder}:${config:torizon_app_root}",
"cross-toolchain-arm64-__container__",
"bash",
"-c",
Expand All @@ -253,20 +253,10 @@
"label": "deploy-torizon-arm64",
"detail": "",
"hide": true,
"command": "scp",
"command": "sleep",
"type": "process",
"args": [
"-i",
"${workspaceFolder}/.conf/id_rsa",
"-o",
"UserKnownHostsFile=/dev/null",
"-o",
"StrictHostKeyChecking=no",
"-P",
"${config:torizon_debug_ssh_port}",
"-pr",
"${workspaceFolder}/build/arm64",
"${config:torizon_run_as}@${config:torizon_ip}:~/app"
"1"
],
"dependsOn": [
"validate-settings",
Expand All @@ -278,8 +268,6 @@
"push-container-torizon-debug-arm64",
"pull-container-torizon-debug-arm64",
"run-container-torizon-debug-arm64",
"wait-a-bit",
"pos-cleanup"
],
"dependsOrder": "sequence",
"problemMatcher": "$msCompile",
Expand All @@ -298,11 +286,11 @@
"run",
"--rm",
"-v",
"${workspaceFolder}:/app",
"${workspaceFolder}:${config:torizon_app_root}",
"cross-toolchain-arm-__container__",
"bash",
"-c",
"\"cmake -DCMAKE_BUILD_TYPE=Debug -B build/armhf -S .\""
"\"cmake -DCMAKE_BUILD_TYPE=Debug -B build/arm -S .\""
],
"problemMatcher": [
"$gcc"
Expand All @@ -326,11 +314,11 @@
"run",
"--rm",
"-v",
"${workspaceFolder}:/app",
"${workspaceFolder}:${config:torizon_app_root}",
"cross-toolchain-arm-__container__",
"bash",
"-c",
"\"cmake --build build/armhf\""
"\"cmake --build build/arm\""
],
"problemMatcher": [
"$gcc"
Expand All @@ -354,11 +342,11 @@
"run",
"--rm",
"-v",
"${workspaceFolder}:/app",
"${workspaceFolder}:${config:torizon_app_root}",
"cross-toolchain-arm-__container__",
"bash",
"-c",
"\"cmake --build build/armhf --target clean\""
"\"cmake --build build/arm --target clean\""
],
"problemMatcher": [
"$gcc"
Expand All @@ -376,20 +364,10 @@
"label": "deploy-torizon-arm",
"detail": "",
"hide": true,
"command": "scp",
"command": "sleep",
"type": "process",
"args": [
"-i",
"${workspaceFolder}/.conf/id_rsa",
"-o",
"UserKnownHostsFile=/dev/null",
"-o",
"StrictHostKeyChecking=no",
"-P",
"${config:torizon_debug_ssh_port}",
"-pr",
"${workspaceFolder}/build/armhf",
"${config:torizon_run_as}@${config:torizon_ip}:~/app"
"1"
],
"dependsOn": [
"validate-settings",
Expand All @@ -401,8 +379,6 @@
"push-container-torizon-debug-arm",
"pull-container-torizon-debug-arm",
"run-container-torizon-debug-arm",
"wait-a-bit",
"pos-cleanup"
],
"dependsOrder": "sequence",
"problemMatcher": "$msCompile",
Expand All @@ -421,7 +397,7 @@
"run",
"--rm",
"-v",
"${workspaceFolder}:/app",
"${workspaceFolder}:${config:torizon_app_root}",
"cross-toolchain-amd64-__container__",
"bash",
"-c",
Expand Down Expand Up @@ -449,7 +425,7 @@
"run",
"--rm",
"-v",
"${workspaceFolder}:/app",
"${workspaceFolder}:${config:torizon_app_root}",
"cross-toolchain-amd64-__container__",
"bash",
"-c",
Expand Down Expand Up @@ -477,7 +453,7 @@
"run",
"--rm",
"-v",
"${workspaceFolder}:/app",
"${workspaceFolder}:${config:torizon_app_root}",
"cross-toolchain-amd64-__change__",
"bash",
"-c",
Expand All @@ -499,20 +475,10 @@
"label": "deploy-torizon-amd64",
"detail": "",
"hide": true,
"command": "scp",
"command": "sleep",
"type": "process",
"args": [
"-i",
"${workspaceFolder}/.conf/id_rsa",
"-o",
"UserKnownHostsFile=/dev/null",
"-o",
"StrictHostKeyChecking=no",
"-P",
"${config:torizon_debug_ssh_port}",
"-pr",
"${workspaceFolder}/amd64/debug",
"${config:torizon_run_as}@${config:torizon_ip}:~/app"
"1"
],
"dependsOn": [
"validate-settings",
Expand All @@ -524,8 +490,6 @@
"push-container-torizon-debug-amd64",
"pull-container-torizon-debug-amd64",
"run-container-torizon-debug-amd64",
"wait-a-bit",
"pos-cleanup"
],
"dependsOrder": "sequence",
"problemMatcher": "$msCompile",
Expand Down
Loading

0 comments on commit 7f52790

Please sign in to comment.