Skip to content

Commit 52fc1c4

Browse files
julianoesjulianoes
authored
Merge pull request #2238 from mavlink/pr-docker-cleanup
Docker cleanup
2 parents 88aba23 + e8b1f54 commit 52fc1c4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+51
-536
lines changed

‎.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ jobs:
245245
id: cache
246246
with:
247247
path: ./build/linux-${{ matrix.arch_name }}/third_party/install
248-
key: ${{ github.job }}-linux-${{ matrix.arch_name }}-${{ hashFiles('./third_party/**') }}-4
248+
key: ${{ github.job }}-linux-${{ matrix.arch_name }}-${{ hashFiles('./third_party/**') }}-5
249249
- name: disable superbuild on cache hit
250250
if: steps.cache.outputs.cache-hit == 'true'
251251
run: echo "superbuild=-DSUPERBUILD=OFF" >> $GITHUB_ENV && echo "cmake_prefix_path=-DCMAKE_PREFIX_PATH=/work/build/linux-${{ matrix.arch_name }}/third_party/install" >> $GITHUB_ENV

‎docker/Dockerfile-Ubuntu-20.04

-59
This file was deleted.

‎docker/Dockerfile-Ubuntu-20.04-APM-SITL-Copter-4.1.2

-38
This file was deleted.

‎docker/Dockerfile-Ubuntu-20.04-APM-SITL-Rover-4.1.2

-37
This file was deleted.

‎docker/Dockerfile-Ubuntu-20.04-PX4-SITL-v1.11

-26
This file was deleted.

‎docker/Dockerfile-Ubuntu-20.04-PX4-SITL-v1.12

-26
This file was deleted.

‎docker/Dockerfile-Ubuntu-22.04-PX4-SITL-v1.13

-28
This file was deleted.

‎docker/Dockerfile-Ubuntu-22.04 ‎docker/Dockerfile-dev

File renamed without changes.

‎docker/Dockerfile.dockcross-linux-arm64-custom

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM dockcross/linux-arm64-lts
1+
FROM dockcross/linux-arm64
22

33
ENV DEFAULT_DOCKCROSS_IMAGE mavsdk/mavsdk-dockcross-linux-arm64-custom
44

‎docker/Dockerfile.dockcross-linux-armv6-custom

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM dockcross/linux-armv6-lts
1+
FROM dockcross/linux-armv6
22

33
ENV DEFAULT_DOCKCROSS_IMAGE mavsdk/mavsdk-dockcross-linux-armv6-custom
44

‎docker/Dockerfile.dockcross-linux-armv7-custom

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM dockcross/linux-armv7-lts
1+
FROM dockcross/linux-armv7
22

33
ENV DEFAULT_DOCKCROSS_IMAGE mavsdk/mavsdk-dockcross-linux-armv7-custom
44

‎docker/build_and_push_docker_images.sh

+2-14
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,12 @@ then
1010
DOCKER_CMD=podman
1111
fi
1212

13-
$DOCKER_CMD build -f Dockerfile-Ubuntu-20.04 -t mavsdk/mavsdk-ubuntu-20.04 .
14-
$DOCKER_CMD build -f Dockerfile-Ubuntu-22.04 -t mavsdk/mavsdk-ubuntu-22.04 .
15-
$DOCKER_CMD build -f Dockerfile-Ubuntu-20.04-PX4-SITL-v1.11 -t mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.11 .
16-
$DOCKER_CMD build -f Dockerfile-Ubuntu-20.04-PX4-SITL-v1.12 -t mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.12 .
17-
$DOCKER_CMD build -f Dockerfile-Ubuntu-22.04-PX4-SITL-v1.13 -t mavsdk/mavsdk-ubuntu-22.04-px4-sitl-v1.13 .
18-
$DOCKER_CMD build -f Dockerfile-Ubuntu-20.04-APM-SITL-Copter-4.1.2 -t mavsdk/mavsdk-ubuntu-20.04-apm-sitl-copter-4.1.2 .
19-
$DOCKER_CMD build -f Dockerfile-Ubuntu-20.04-APM-SITL-Rover-4.1.2 -t mavsdk/mavsdk-ubuntu-20.04-apm-sitl-rover-4.1.2 .
13+
$DOCKER_CMD build -f Dockerfile-dev -t mavsdk/mavsdk-dev .
2014
$DOCKER_CMD build -f Dockerfile.dockcross-linux-armv6-custom -t mavsdk/mavsdk-dockcross-linux-armv6-custom .
2115
$DOCKER_CMD build -f Dockerfile.dockcross-linux-armv7-custom -t mavsdk/mavsdk-dockcross-linux-armv7-custom .
2216
$DOCKER_CMD build -f Dockerfile.dockcross-linux-arm64-custom -t mavsdk/mavsdk-dockcross-linux-arm64-custom .
2317

24-
$DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04:latest
25-
$DOCKER_CMD push mavsdk/mavsdk-ubuntu-22.04:latest
26-
$DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.11:latest
27-
$DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.12:latest
28-
$DOCKER_CMD push mavsdk/mavsdk-ubuntu-22.04-px4-sitl-v1.13:latest
29-
$DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04-apm-sitl-copter-4.1.2:latest
30-
$DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04-apm-sitl-rover-4.1.2:latest
18+
$DOCKER_CMD push mavsdk/mavsdk-dev:latest
3119
$DOCKER_CMD push mavsdk/mavsdk-dockcross-linux-armv6-custom:latest
3220
$DOCKER_CMD push mavsdk/mavsdk-dockcross-linux-armv7-custom:latest
3321
$DOCKER_CMD push mavsdk/mavsdk-dockcross-linux-arm64-custom:latest

‎src/integration_tests/CMakeLists.txt

-13
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,3 @@ target_link_libraries(integration_tests_runner
9898
add_test(integration_tests
9999
integration_tests_runner
100100
)
101-
102-
add_custom_command(TARGET integration_tests_runner
103-
POST_BUILD
104-
COMMAND ${CMAKE_COMMAND} -E copy_if_different
105-
${CMAKE_CURRENT_SOURCE_DIR}/../../tools/start_sitl.sh
106-
${CMAKE_CURRENT_BINARY_DIR}
107-
)
108-
add_custom_command(TARGET integration_tests_runner
109-
POST_BUILD
110-
COMMAND ${CMAKE_COMMAND} -E copy_if_different
111-
${CMAKE_CURRENT_SOURCE_DIR}/../../tools/stop_sitl.sh
112-
${CMAKE_CURRENT_BINARY_DIR}
113-
)

‎src/integration_tests/action_goto.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
using namespace mavsdk;
99

10-
TEST_F(SitlTest, PX4ActionGoto)
10+
TEST(SitlTest, PX4ActionGoto)
1111
{
1212
Mavsdk mavsdk{Mavsdk::Configuration{Mavsdk::ComponentType::GroundStation}};
1313

‎src/integration_tests/action_hold.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
using namespace mavsdk;
99

10-
TEST_F(SitlTest, PX4ActionHold)
10+
TEST(SitlTest, PX4ActionHold)
1111
{
1212
Mavsdk mavsdk{Mavsdk::Configuration{Mavsdk::ComponentType::GroundStation}};
1313

‎src/integration_tests/action_hover_async.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
using namespace mavsdk;
99

10-
TEST_F(SitlTest, ActionHoverAsync)
10+
TEST(SitlTest, ActionHoverAsync)
1111
{
1212
Mavsdk mavsdk{Mavsdk::Configuration{Mavsdk::ComponentType::GroundStation}};
1313

‎src/integration_tests/action_hover_sync.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,34 @@ using namespace mavsdk;
1010
static void takeoff_and_hover_at_altitude(float altitude_m);
1111
void takeoff_and_hover_at_altitude_apm(float altitude_m);
1212

13-
TEST_F(SitlTest, PX4ActionHoverSyncDefault)
13+
TEST(SitlTest, PX4ActionHoverSyncDefault)
1414
{
1515
takeoff_and_hover_at_altitude(2.5);
1616
}
1717

18-
TEST_F(SitlTest, PX4ActionHoverSyncHigher)
18+
TEST(SitlTest, PX4ActionHoverSyncHigher)
1919
{
2020
takeoff_and_hover_at_altitude(5.0f);
2121
}
2222

23-
TEST_F(SitlTest, PX4ActionHoverSyncLower)
23+
TEST(SitlTest, PX4ActionHoverSyncLower)
2424
{
2525
// TODO: less than 1.0 is currently failing due to a Firmware bug.
2626
// https://github.com/PX4/Firmware/issues/12471
2727
takeoff_and_hover_at_altitude(1.5f);
2828
}
2929

30-
TEST_F(SitlTest, APMActionHoverSyncDefault)
30+
TEST(SitlTest, APMActionHoverSyncDefault)
3131
{
3232
takeoff_and_hover_at_altitude_apm(2.5);
3333
}
3434

35-
TEST_F(SitlTest, APMActionHoverSyncHigher)
35+
TEST(SitlTest, APMActionHoverSyncHigher)
3636
{
3737
takeoff_and_hover_at_altitude_apm(5.0f);
3838
}
3939

40-
TEST_F(SitlTest, APMActionHoverSyncLower)
40+
TEST(SitlTest, APMActionHoverSyncLower)
4141
{
4242
// TODO: less than 1.0 is currently failing due to a Firmware bug.
4343
// https://github.com/PX4/Firmware/issues/12471

‎src/integration_tests/action_takeoff_and_kill.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
#include <iostream>
2+
#include <future>
23
#include "integration_test_helper.h"
34
#include "mavsdk.h"
45
#include "plugins/action/action.h"
56
#include "plugins/telemetry/telemetry.h"
67

78
using namespace mavsdk;
89

9-
TEST_F(SitlTest, ActionTakeoffAndKill)
10+
TEST(SitlTest, ActionTakeoffAndKill)
1011
{
1112
Mavsdk mavsdk{Mavsdk::Configuration{Mavsdk::ComponentType::GroundStation}};
1213
ASSERT_EQ(mavsdk.add_udp_connection(), ConnectionResult::Success);

‎src/integration_tests/action_transition_multicopter_fixedwing.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
using namespace mavsdk;
99

10-
TEST_F(SitlTest, PX4ActionTransitionSync_standard_vtol)
10+
TEST(SitlTest, PX4ActionTransitionSync_standard_vtol)
1111
{
1212
// Init & connect
1313
Mavsdk mavsdk{Mavsdk::Configuration{Mavsdk::ComponentType::GroundStation}};

0 commit comments

Comments
 (0)